public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework more commons-lang usages (#10314)

Browse Source 
* Reworks many commons-lang usages to use standard Java
* Updates all remaining commons.lang imports to commons.lang3

Related to openhab/openhab-addons#7722

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2021-03-16 12:38:16 +01:00
committed by GitHub
parent 16fba31556
commit f3503430b4
257 changed files with 906 additions and 1125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/config/YamahaBridgeConfig.java
View File

@@ -14,7 +14,6 @@ package org.openhab.binding.yamahareceiver.internal.config;
import java.util.Optional;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
@@ -65,7 +64,7 @@ public class YamahaBridgeConfig {
public Optional<String> getHostWithPort() {
final String str = host;
if (StringUtils.isEmpty(str)) {
if (str == null || str.isEmpty()) {
return Optional.empty();
}
return Optional.of(str + ":" + port);

3
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/DeviceDescriptorXML.java
View File

@@ -26,7 +26,6 @@ import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Stream;
import org.apache.commons.lang.StringUtils;
import org.openhab.binding.yamahareceiver.internal.YamahaReceiverBindingConstants.Feature;
import org.openhab.binding.yamahareceiver.internal.YamahaReceiverBindingConstants.Zone;
import org.openhab.binding.yamahareceiver.internal.config.YamahaUtils;
@@ -216,7 +215,7 @@ public class DeviceDescriptorXML {
elements.forEach(e -> {
String tag = e.getAttribute("YNC_Tag");
if (StringUtils.isNotEmpty(tag)) {
if (!tag.isEmpty()) {
T key = converter.apply(tag);
if (key != null) {
V value = factory.apply(key, e);

3
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/DeviceInformationXML.java
View File

@@ -21,7 +21,6 @@ import java.io.IOException;
import java.lang.ref.WeakReference;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.openhab.binding.yamahareceiver.internal.YamahaReceiverBindingConstants.Feature;
import org.openhab.binding.yamahareceiver.internal.YamahaReceiverBindingConstants.Zone;
import org.openhab.binding.yamahareceiver.internal.protocol.AbstractConnection;
@@ -136,7 +135,7 @@ public class DeviceInformationXML implements DeviceInformation {
// Retrieve Main_Zone basic status, from which we will know this AVR supports Zone_B feature.
Node basicStatusNode = getZoneResponse(con, Main_Zone, ZONE_BASIC_STATUS_CMD, ZONE_BASIC_STATUS_PATH);
String power = getNodeContentOrEmpty(basicStatusNode, "Power_Control/Zone_B_Power_Info");
if (StringUtils.isNotEmpty(power)) {
if (!power.isEmpty()) {
logger.debug("Zone_2 emulation enabled via Zone_B");
state.zones.add(Zone_2);
state.features.add(Feature.ZONE_B);

3
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/InputConverterXML.java
View File

@@ -22,7 +22,6 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Stream;
import org.apache.commons.lang.StringUtils;
import org.openhab.binding.yamahareceiver.internal.YamahaReceiverBindingConstants.Zone;
import org.openhab.binding.yamahareceiver.internal.protocol.AbstractConnection;
import org.openhab.binding.yamahareceiver.internal.protocol.InputConverter;
@@ -74,7 +73,7 @@ public class InputConverterXML implements InputConverter {
private Map<String, String> createMapFromSetting(String setting) {
Map<String, String> map = new HashMap<>();
if (!StringUtils.isEmpty(setting)) {
if (setting != null && !setting.isEmpty()) {
String[] entries = setting.split(","); // will contain KEY=VALUE entires
for (String entry : entries) {
String[] keyValue = entry.split("="); // split the KEY=VALUE string

4
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/InputWithPlayControlXML.java
View File

@@ -19,7 +19,6 @@ import static org.openhab.binding.yamahareceiver.internal.protocol.xml.XMLUtils.
import java.io.IOException;
import org.apache.commons.lang.StringUtils;
import org.openhab.binding.yamahareceiver.internal.config.YamahaBridgeConfig;
import org.openhab.binding.yamahareceiver.internal.protocol.AbstractConnection;
import org.openhab.binding.yamahareceiver.internal.protocol.InputWithPlayControl;
@@ -244,8 +243,7 @@ public class InputWithPlayControlXML extends AbstractInputControlXML implements
// Spotify and NET RADIO input supports song cover image (at least on RX-S601D)
String songImageUrl = getNodeContentOrEmpty(node, "Play_Info/Album_ART/URL");
msg.songImageUrl = StringUtils.isNotEmpty(songImageUrl)
? String.format("http://%s%s", con.getHost(), songImageUrl)
msg.songImageUrl = !songImageUrl.isEmpty() ? String.format("http://%s%s", con.getHost(), songImageUrl)
: bridgeConfig.getAlbumUrl();
logger.trace("Playback: {}, Station: {}, Artist: {}, Album: {}, Song: {}, SongImageUrl: {}", msg.playbackMode,

10
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/InputWithPresetControlXML.java
View File

@@ -18,8 +18,8 @@ import static org.openhab.binding.yamahareceiver.internal.protocol.xml.XMLUtils.
import java.io.IOException;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.openhab.binding.yamahareceiver.internal.protocol.AbstractConnection;
import org.openhab.binding.yamahareceiver.internal.protocol.InputWithPresetControl;
import org.openhab.binding.yamahareceiver.internal.protocol.ReceivedMessageParseException;
@@ -116,7 +116,7 @@ public class InputWithPresetControlXML extends AbstractInputControlXML implement
String value = getNodeContentOrDefault(itemNode, "Param", String.valueOf(i));
// For RX-V3900 when a preset slot is not used, this is how it looks
if (StringUtils.isEmpty(title) && "Not Used".equalsIgnoreCase(value)) {
if (title.isEmpty() && "Not Used".equalsIgnoreCase(value)) {
continue;
}
@@ -130,7 +130,7 @@ public class InputWithPresetControlXML extends AbstractInputControlXML implement
String presetValue = getNodeContentOrEmpty(response, preset.getPath());
// fall back to second method of obtaining current preset (works for Tuner on RX-V3900)
if (StringUtils.isEmpty(presetValue)) {
if (presetValue.isEmpty()) {
try {
Node presetResponse = getResponse(con, wrInput(preset.apply(GET_PARAM)), inputElement);
presetValue = getNodeContentOrEmpty(presetResponse, preset.getPath());
@@ -146,7 +146,7 @@ public class InputWithPresetControlXML extends AbstractInputControlXML implement
}
private int convertToPresetNumber(String presetValue) {
if (StringUtils.isNotEmpty(presetValue)) {
if (!presetValue.isEmpty()) {
if (StringUtils.isNumeric(presetValue)) {
return Integer.parseInt(presetValue);
} else {

3
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/InputWithTunerDABControlXML.java
View File

@@ -16,7 +16,6 @@ import static org.openhab.binding.yamahareceiver.internal.protocol.xml.XMLUtils.
import java.io.IOException;
import org.apache.commons.lang.StringUtils;
import org.openhab.binding.yamahareceiver.internal.protocol.AbstractConnection;
import org.openhab.binding.yamahareceiver.internal.protocol.InputWithPresetControl;
import org.openhab.binding.yamahareceiver.internal.protocol.InputWithTunerBandControl;
@@ -172,7 +171,7 @@ public class InputWithTunerDABControlXML extends AbstractInputControlXML
// store last state of band
bandState = msgForBand;
if (StringUtils.isEmpty(msgForBand.band)) {
if (msgForBand.band.isEmpty()) {
logger.warn("Band is unknown for input {}, therefore preset and playback information will not be available",
inputID);
} else {

3
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/XMLConnection.java
View File

@@ -26,7 +26,6 @@ import java.nio.charset.UnsupportedCharsetException;
import java.util.Arrays;
import java.util.Optional;
import org.apache.commons.lang.StringUtils;
import org.openhab.binding.yamahareceiver.internal.protocol.AbstractConnection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -183,7 +182,7 @@ public class XMLConnection extends AbstractConnection {
.filter(x -> x.toLowerCase().startsWith(HEADER_CHARSET_PART))
.map(x -> x.substring(HEADER_CHARSET_PART.length() + 1, x.length() - 1)).findFirst();
if (charsetName.isPresent() && !StringUtils.isEmpty(charsetName.get())) {
if (charsetName.isPresent() && !charsetName.get().isEmpty()) {
try {
charset = Charset.forName(charsetName.get());
} catch (UnsupportedCharsetException | IllegalCharsetNameException e) {

5
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/ZoneControlXML.java
View File

@@ -22,7 +22,6 @@ import java.io.IOException;
import java.lang.ref.WeakReference;
import java.util.function.Supplier;
import org.apache.commons.lang.StringUtils;
import org.openhab.binding.yamahareceiver.internal.YamahaReceiverBindingConstants.Zone;
import org.openhab.binding.yamahareceiver.internal.config.YamahaZoneConfig;
import org.openhab.binding.yamahareceiver.internal.protocol.AbstractConnection;
@@ -135,7 +134,7 @@ public class ZoneControlXML implements ZoneControl {
ZONE_BASIC_STATUS_PATH);
String surroundProgram = getNodeContentOrEmpty(basicStatusNode, "Surr/Pgm_Sel/Pgm");
if (StringUtils.isNotEmpty(surroundProgram)) {
if (!surroundProgram.isEmpty()) {
surroundSelProgram = new CommandTemplate(
"<Surr><Pgm_Sel><Straight>Off</Straight><Pgm>%s</Pgm></Pgm_Sel></Surr>", "Surr/Pgm_Sel/Pgm");
logger.debug("Zone {} - adjusting command to: {}", getZone(), surroundSelProgram);
@@ -287,7 +286,7 @@ public class ZoneControlXML implements ZoneControl {
value = getNodeContentOrEmpty(statusNode, inputSel.getPath());
state.inputID = inputConverterSupplier.get().fromStateName(value);
if (StringUtils.isBlank(state.inputID)) {
if (state.inputID == null || state.inputID.isBlank()) {
throw new ReceivedMessageParseException("Expected inputID. Failed to read Input/Input_Sel");
}

3
bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/state/NavigationControlState.java
View File

@@ -12,7 +12,6 @@
*/
package org.openhab.binding.yamahareceiver.internal.state;
import org.apache.commons.lang.StringUtils;
import org.openhab.binding.yamahareceiver.internal.protocol.xml.InputWithNavigationControlXML;
/**
@@ -37,7 +36,7 @@ public class NavigationControlState implements Invalidateable {
public String getAllItemLabels() {
StringBuilder sb = new StringBuilder();
for (String item : items) {
if (StringUtils.isNotEmpty(item)) {
if (item != null && !item.isEmpty()) {
sb.append(item);
sb.append(',');
}