Skip to content

Commit c9864d6

Browse files
lsiepellsiepel
authored
[max] Remove org.apache.commons (openhab#14413)
Signed-off-by: Leo Siepel <[email protected]>
1 parent c544f12 commit c9864d6

File tree

6 files changed

+26
-29
lines changed

6 files changed

+26
-29
lines changed

‎bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/MCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import java.util.Set;
2222
import java.util.TreeSet;
2323

24-
import org.apache.commons.lang3.StringUtils;
2524
import org.eclipse.jdt.annotation.NonNullByDefault;
2625
import org.openhab.binding.max.internal.Utils;
2726
import org.openhab.binding.max.internal.device.Device;
2827
import org.openhab.binding.max.internal.device.RoomInformation;
28+
import org.openhab.core.util.StringUtils;
2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;
3131

‎bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/TCommand.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import java.util.Base64;
1717
import java.util.List;
1818

19-
import org.apache.commons.lang3.ArrayUtils;
2019
import org.eclipse.jdt.annotation.NonNullByDefault;
2120
import org.openhab.binding.max.internal.Utils;
2221

@@ -49,9 +48,13 @@ public void addRoom(String rfAddress) {
4948
@Override
5049
public String getCommandString() {
5150
final int updateForced = forceUpdate ? FORCE_UPDATE : NO_FORCE_UPDATE;
52-
byte[] commandArray = null;
51+
byte[] commandArray = new byte[0];
5352
for (String rfAddress : rfAddresses) {
54-
commandArray = ArrayUtils.addAll(Utils.hexStringToByteArray(rfAddress), commandArray);
53+
byte[] rfAddressArray = Utils.hexStringToByteArray(rfAddress);
54+
byte[] tnmpArray = new byte[rfAddressArray.length + commandArray.length];
55+
System.arraycopy(rfAddressArray, 0, tnmpArray, 0, rfAddressArray.length);
56+
System.arraycopy(commandArray, 0, tnmpArray, rfAddressArray.length, commandArray.length);
57+
commandArray = tnmpArray;
5558
}
5659
String encodedString = Base64.getEncoder().encodeToString(commandArray);
5760

‎bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/handler/MaxCubeBridgeHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private enum BackupState {
126126
/** maximum queue size that we're allowing */
127127
private static final int MAX_COMMANDS = 50;
128128
private static final int MAX_DUTY_CYCLE = 80;
129-
private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd-HHmm");
129+
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd-HHmm");
130130

131131
private final Logger logger = LoggerFactory.getLogger(MaxCubeBridgeHandler.class);
132132
private final List<Device> devices = new ArrayList<>();
@@ -1025,7 +1025,7 @@ public boolean hasExcessDutyCycle() {
10251025
public void backup() {
10261026
this.backup = BackupState.REQUESTED;
10271027
this.backupUtil = new MaxBackupUtils(
1028-
new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().format(formatter));
1028+
new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().format(FORMATTER));
10291029
socketClose();
10301030
}
10311031
}

‎bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/handler/MaxDevicesHandler.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -536,30 +536,30 @@ public void bridgeStatusChanged(ThingStatusInfo bridgeStatusInfo) {
536536
*/
537537
private void setDeviceConfiguration(Device device) {
538538
try {
539-
boolean config_changed = false;
539+
boolean configChanged = false;
540540
logger.debug("MAX! {} {} configuration update", device.getType(), device.getSerialNumber());
541541
Configuration configuration = editConfiguration();
542542
if (!device.getRoomName().equalsIgnoreCase((String) getConfig().get(PROPERTY_ROOMNAME))) {
543543
configuration.put(PROPERTY_ROOMNAME, device.getRoomName());
544-
config_changed = true;
544+
configChanged = true;
545545
}
546546
if (getConfig().get(PROPERTY_ROOMID) == null || new BigDecimal(device.getRoomId())
547547
.compareTo((BigDecimal) getConfig().get(PROPERTY_ROOMID)) != 0) {
548548
configuration.put(PROPERTY_ROOMID, new BigDecimal(device.getRoomId()));
549-
config_changed = true;
549+
configChanged = true;
550550
}
551551
if (!device.getName().equalsIgnoreCase((String) getConfig().get(PROPERTY_DEVICENAME))) {
552552
configuration.put(PROPERTY_DEVICENAME, device.getName());
553-
config_changed = true;
553+
configChanged = true;
554554
}
555555
if (!device.getRFAddress().equalsIgnoreCase((String) getConfig().get(PROPERTY_RFADDRESS))) {
556556
configuration.put(PROPERTY_RFADDRESS, device.getRFAddress());
557-
config_changed = true;
557+
configChanged = true;
558558
}
559559
for (Map.Entry<String, Object> entry : device.getProperties().entrySet()) {
560560
configuration.put(entry.getKey(), entry.getValue());
561561
}
562-
if (config_changed) {
562+
if (configChanged) {
563563
updateConfiguration(configuration);
564564
logger.debug("Config updated: {}", configuration.getProperties());
565565
} else {

‎bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/CMessage.java

+4-10
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import java.util.HashMap;
2626
import java.util.Map;
2727

28-
import org.apache.commons.lang3.StringUtils;
2928
import org.eclipse.jdt.annotation.NonNullByDefault;
3029
import org.openhab.binding.max.internal.Utils;
3130
import org.openhab.binding.max.internal.device.DeviceType;
31+
import org.openhab.core.util.StringUtils;
3232
import org.slf4j.Logger;
3333
import org.slf4j.LoggerFactory;
3434

@@ -109,11 +109,7 @@ public CMessage(String raw) {
109109

110110
private String getSerialNumber(byte[] bytes) {
111111
byte[] sn = new byte[10];
112-
113-
for (int i = 0; i < 10; i++) {
114-
sn[i] = bytes[i + 8];
115-
}
116-
112+
System.arraycopy(bytes, 8, sn, 0, sn.length);
117113
return new String(sn, StandardCharsets.UTF_8);
118114
}
119115

@@ -124,10 +120,8 @@ private String parseData(byte[] bytes) {
124120
try {
125121
int dataStart = 18;
126122
byte[] sn = new byte[bytes.length - dataStart];
123+
System.arraycopy(bytes, dataStart, sn, 0, sn.length);
127124

128-
for (int i = 0; i < sn.length; i++) {
129-
sn[i] = bytes[i + dataStart];
130-
}
131125
logger.trace("DataBytes: {}", Utils.getHex(sn));
132126
return new String(sn, StandardCharsets.UTF_8);
133127
} catch (Exception e) {
@@ -278,7 +272,7 @@ public void debug(Logger logger) {
278272
logger.debug("RoomID: {}", roomId);
279273
for (String key : properties.keySet()) {
280274
if (!key.startsWith("Unknown")) {
281-
String propertyName = String.join(" ", StringUtils.splitByCharacterTypeCamelCase(key));
275+
String propertyName = String.join(" ", StringUtils.splitByCharacterType(key));
282276
logger.debug("{}: {}", propertyName, properties.get(key));
283277
} else {
284278
logger.debug("{}: {}", key, properties.get(key));

‎bundles/org.openhab.binding.max/src/test/java/org/openhab/binding/max/internal/message/MessageProcessorTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ public void testSingleM_Message() throws Exception {
9191

9292
@Test
9393
public void testMultilineM_Message() throws Exception {
94-
String line1_part1 = "M:00,02,";
95-
String line1_part2 = "VgIMAQpXb2huemltbWVyCvMrAgtUb2lsZXR0ZSBFRwrenQMOVG9pbGV0dGUgMS4gT0cK3rgECkJhZGV6aW1tZXIK3qoFDFNjaGxhZnppbW1lcgresQYDSmFuD4lCBwlDaHJpc3RpbmEPiTYIBEZsdXIPiT0KEEJhZGV6aW1tZXIgMi4gT0cPiRwLBULDvHJvD4k/DAxHw6RzdGV6aW1tZXIPiRoJC1dhc2Noa8O8Y2hlD4lXNgQHOCtLRVEwMTg4NjczCFRlcnJhc3NlAQQHMblLRVEwMTg3MTkwCEZsdXJ0w7xyAQIK8ytLRVEwMzc5NTg3C1dhbmRoZWl6dW5nAQIK9P9LRVEwMzgwMDU1DkZlbnN0ZXJoZWl6dW5nAQQHMbtLRVEwMTg3MTg4CEZsdXJ0w7xyAgQHMuxLRVEwMTg2ODg0B0ZlbnN0ZXICAQrenUtFUTA0MDY5NjIHSGVpenVuZwIBCt64S0VRMDQwNjk4OQdIZWl6dW5nAwQIFGdLRVEwMTkwNTc3B0ZlbnN0ZXIDBAc2l0tFUTAxODU5NDUIRmx1cnTDvHIEAQreqktFUTA0MDY5NzUHSGVpenVuZwQBCt8JS0VRMDQwNzA3MA5IYW5kdHVjaGVpenVuZwQEBzhTS0VRMDE4ODcxMAdGZW5zdGVyBAQIFIxLRVEwMTkwNTQzFkZlbnN0ZXIgU3RyYcOfZSByZWNodHMFAQresUtFUTA0MDY5ODIHSGVpenVuZwUEBzHmS0VRMDE4NzE0NhVGZW5zdGVyIFN0cmHDn2UgbGlua3MFAxBXqUxFUTA5ODIxNTYOV2FuZHRoZXJtb3N0YXQBBA/u1ExFUTA3OTQ3NTIIRmx1cnTDvHIGBA/v6kxFUTA3OTQ0NzQNRmVuc3RlciBsaW5rcwYED/HnTEVRMDc5Mzk2NA5GZW5zdGVyIHJlY2h0cwYBD4lCTEVRMTAwNDYwMAdIZWl6dW5nBgQP9BVMRVEwNzkzNDA2CEZsdXJ0w7xyBwQP79FMRVEwNzk0NDk5B0ZlbnN0ZXIHAQ+JNkxFUTEwMDQ1ODgHSGVpenVuZwcBD4k9TEVRMTAwNDU5NQ1IZWl6dW5nIHVudGVuCAEPiRxMRVExMDA0NTYyB0hlaXp1bmcKBA/yTUxFUTA3OTM4NjIHRmVuc3RlcgoED/F+TEVRMDc5NDA2OQhGbHVydMO8cgoBD4k/TEVRMTAwNDU5NwdIZWl6dW5nCwQP8YdMRVEwNzk0MDYwB0ZlbnN0ZXILBA/xSExFUTA3OTQxMjQIRmx1cnTDvHILBA/yVkxFUTA3OTM4NTMURmVuc3RlciBHYXJ0ZW4gbGlua3MMBA/yI0xFUTA3OTM5MDQVRmVuc3RlciBHYXJ0ZW4gcmVjaHRzDAEPiRpMRVExMDA0NTYwB0hlaXp1bmcMBA/vj0xFUTA3OTQ1NjUPRmVuc3RlciBTdHJhw59lDAQP8CtMRVEwNzk0NDA5BFTDvHIDBAgUa0tFUTAxODcwNjkNRmVuc3RlciBTZWl0ZQUEBzagS0VRMDE4NTkzNhVGZW5zdGVyIFN0cmHDn2UgbGlua3MBBA/wI0xFUTA3OTQ0MTYORmVuc3RlciBLw7xjaGUBAxBV50xFUTA5ODI2NzYOV2FuZHRoZXJtb3N0YXQFAxBW2kxFUTA5ODIzNjgOV2FuZHRoZXJtb3N0YXQEAxBV4kxFUTA5ODI2NzEOV2FuZHRoZXJtb3N0YXQHAxBZWExFUTA5ODE3MjkOV2FuZHRoZXJtb3N0YXQMAxBV6ExFUTA5ODI2NzcOV2FuZHRoZXJtb3N0YXQGAxBV40xFUTA5ODI2NzIOV2FuZHRoZXJtb3N0YXQKBAcxoEtFUTAxODcyMTYLV2FzY2hrw7xjaGUF";
96-
String line1 = line1_part1 + line1_part2;
94+
String line1Part1 = "M:00,02,";
95+
String line1Part2 = "VgIMAQpXb2huemltbWVyCvMrAgtUb2lsZXR0ZSBFRwrenQMOVG9pbGV0dGUgMS4gT0cK3rgECkJhZGV6aW1tZXIK3qoFDFNjaGxhZnppbW1lcgresQYDSmFuD4lCBwlDaHJpc3RpbmEPiTYIBEZsdXIPiT0KEEJhZGV6aW1tZXIgMi4gT0cPiRwLBULDvHJvD4k/DAxHw6RzdGV6aW1tZXIPiRoJC1dhc2Noa8O8Y2hlD4lXNgQHOCtLRVEwMTg4NjczCFRlcnJhc3NlAQQHMblLRVEwMTg3MTkwCEZsdXJ0w7xyAQIK8ytLRVEwMzc5NTg3C1dhbmRoZWl6dW5nAQIK9P9LRVEwMzgwMDU1DkZlbnN0ZXJoZWl6dW5nAQQHMbtLRVEwMTg3MTg4CEZsdXJ0w7xyAgQHMuxLRVEwMTg2ODg0B0ZlbnN0ZXICAQrenUtFUTA0MDY5NjIHSGVpenVuZwIBCt64S0VRMDQwNjk4OQdIZWl6dW5nAwQIFGdLRVEwMTkwNTc3B0ZlbnN0ZXIDBAc2l0tFUTAxODU5NDUIRmx1cnTDvHIEAQreqktFUTA0MDY5NzUHSGVpenVuZwQBCt8JS0VRMDQwNzA3MA5IYW5kdHVjaGVpenVuZwQEBzhTS0VRMDE4ODcxMAdGZW5zdGVyBAQIFIxLRVEwMTkwNTQzFkZlbnN0ZXIgU3RyYcOfZSByZWNodHMFAQresUtFUTA0MDY5ODIHSGVpenVuZwUEBzHmS0VRMDE4NzE0NhVGZW5zdGVyIFN0cmHDn2UgbGlua3MFAxBXqUxFUTA5ODIxNTYOV2FuZHRoZXJtb3N0YXQBBA/u1ExFUTA3OTQ3NTIIRmx1cnTDvHIGBA/v6kxFUTA3OTQ0NzQNRmVuc3RlciBsaW5rcwYED/HnTEVRMDc5Mzk2NA5GZW5zdGVyIHJlY2h0cwYBD4lCTEVRMTAwNDYwMAdIZWl6dW5nBgQP9BVMRVEwNzkzNDA2CEZsdXJ0w7xyBwQP79FMRVEwNzk0NDk5B0ZlbnN0ZXIHAQ+JNkxFUTEwMDQ1ODgHSGVpenVuZwcBD4k9TEVRMTAwNDU5NQ1IZWl6dW5nIHVudGVuCAEPiRxMRVExMDA0NTYyB0hlaXp1bmcKBA/yTUxFUTA3OTM4NjIHRmVuc3RlcgoED/F+TEVRMDc5NDA2OQhGbHVydMO8cgoBD4k/TEVRMTAwNDU5NwdIZWl6dW5nCwQP8YdMRVEwNzk0MDYwB0ZlbnN0ZXILBA/xSExFUTA3OTQxMjQIRmx1cnTDvHILBA/yVkxFUTA3OTM4NTMURmVuc3RlciBHYXJ0ZW4gbGlua3MMBA/yI0xFUTA3OTM5MDQVRmVuc3RlciBHYXJ0ZW4gcmVjaHRzDAEPiRpMRVExMDA0NTYwB0hlaXp1bmcMBA/vj0xFUTA3OTQ1NjUPRmVuc3RlciBTdHJhw59lDAQP8CtMRVEwNzk0NDA5BFTDvHIDBAgUa0tFUTAxODcwNjkNRmVuc3RlciBTZWl0ZQUEBzagS0VRMDE4NTkzNhVGZW5zdGVyIFN0cmHDn2UgbGlua3MBBA/wI0xFUTA3OTQ0MTYORmVuc3RlciBLw7xjaGUBAxBV50xFUTA5ODI2NzYOV2FuZHRoZXJtb3N0YXQFAxBW2kxFUTA5ODIzNjgOV2FuZHRoZXJtb3N0YXQEAxBV4kxFUTA5ODI2NzEOV2FuZHRoZXJtb3N0YXQHAxBZWExFUTA5ODE3MjkOV2FuZHRoZXJtb3N0YXQMAxBV6ExFUTA5ODI2NzcOV2FuZHRoZXJtb3N0YXQGAxBV40xFUTA5ODI2NzIOV2FuZHRoZXJtb3N0YXQKBAcxoEtFUTAxODcyMTYLV2FzY2hrw7xjaGUF";
96+
String line1 = line1Part1 + line1Part2;
9797

98-
String line2_part1 = "M:01,02,";
99-
String line2_part2 = "AxBV8ExFUTA5ODI2ODUOV2FuZHRoZXJtb3N0YXQJBA/v50xFUTA3OTQ0NzcNQmFsa29uZmVuc3RlcgkBD4lXTEVRMTAwNDYyMRZIZWl6dW5nIHVudGVybSBGZW5zdGVyCQQP8llMRVEwNzkzODUwDkZlbnN0ZXIgcmVjaHRzCQQP8bxMRVEwNzk0MDA3DUZlbnN0ZXIgbGlua3MJAQ+JOExFUTEwMDQ1OTAOSGVpenVuZyBCYWxrb24JBA/yLExFUTA3OTM4OTUKQmFsa29udMO8cgkED++zTEVRMDc5NDUyOQhGbHVydMO8cgkB";
100-
String line2 = line2_part1 + line2_part2;
98+
String line2Part1 = "M:01,02,";
99+
String line2Part2 = "AxBV8ExFUTA5ODI2ODUOV2FuZHRoZXJtb3N0YXQJBA/v50xFUTA3OTQ0NzcNQmFsa29uZmVuc3RlcgkBD4lXTEVRMTAwNDYyMRZIZWl6dW5nIHVudGVybSBGZW5zdGVyCQQP8llMRVEwNzkzODUwDkZlbnN0ZXIgcmVjaHRzCQQP8bxMRVEwNzk0MDA3DUZlbnN0ZXIgbGlua3MJAQ+JOExFUTEwMDQ1OTAOSGVpenVuZyBCYWxrb24JBA/yLExFUTA3OTM4OTUKQmFsa29udMO8cgkED++zTEVRMDc5NDUyOQhGbHVydMO8cgkB";
100+
String line2 = line2Part1 + line2Part2;
101101

102-
String expectedString = line1 + line2_part2;
102+
String expectedString = line1 + line2Part2;
103103
MMessage expectedMessage = new MMessage(expectedString);
104104

105105
assertFalse(this.processor.addReceivedLine(line1));

0 commit comments

Comments
 (0)