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

27
bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/discovery/SonyAudioDiscoveryParticipant.java
View File

@@ -22,7 +22,6 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils;
import org.jupnp.model.meta.RemoteDevice;
import org.openhab.binding.sonyaudio.internal.SonyAudioBindingConstants;
import org.openhab.core.config.discovery.DiscoveryResult;
@@ -61,15 +60,15 @@ public class SonyAudioDiscoveryParticipant implements UpnpDiscoveryParticipant {
ThingUID thingUid = getThingUID(device);
if (thingUid != null) {
String label = StringUtils.isEmpty(device.getDetails().getFriendlyName()) ? device.getDisplayString()
: device.getDetails().getFriendlyName();
String host = device.getIdentity().getDescriptorURL().getHost();
int port = device.getIdentity().getDescriptorURL().getPort();
String path = device.getIdentity().getDescriptorURL().getPath();
String friendlyName = device.getDetails().getFriendlyName();
String label = friendlyName == null || friendlyName.isEmpty() ? device.getDisplayString() : friendlyName;
URL descriptorURL = device.getIdentity().getDescriptorURL();
String host = descriptorURL.getHost();
int port = descriptorURL.getPort();
String path = descriptorURL.getPath();
try {
Map<String, Object> properties = getDescription(host, port, path);
properties.put(SonyAudioBindingConstants.HOST_PARAMETER,
device.getIdentity().getDescriptorURL().getHost());
properties.put(SonyAudioBindingConstants.HOST_PARAMETER, descriptorURL.getHost());
result = DiscoveryResultBuilder.create(thingUid).withLabel(label).withProperties(properties).build();
} catch (IOException e) {
return null;
@@ -82,18 +81,20 @@ public class SonyAudioDiscoveryParticipant implements UpnpDiscoveryParticipant {
public ThingUID getThingUID(RemoteDevice device) {
ThingUID result = null;
if (!StringUtils.containsIgnoreCase(device.getDetails().getManufacturerDetails().getManufacturer(),
SonyAudioBindingConstants.MANUFACTURER)) {
String manufacturer = device.getDetails().getManufacturerDetails().getManufacturer();
if (manufacturer == null
|| !manufacturer.toLowerCase().contains(SonyAudioBindingConstants.MANUFACTURER.toLowerCase())) {
return result;
}
logger.debug("Manufacturer matched: search: {}, device value: {}.", SonyAudioBindingConstants.MANUFACTURER,
device.getDetails().getManufacturerDetails().getManufacturer());
if (!StringUtils.containsIgnoreCase(device.getType().getType(), SonyAudioBindingConstants.UPNP_DEVICE_TYPE)) {
manufacturer);
String type = device.getType().getType();
if (type == null || !type.toLowerCase().contains(SonyAudioBindingConstants.UPNP_DEVICE_TYPE.toLowerCase())) {
return result;
}
logger.debug("Device type matched: search: {}, device value: {}.", SonyAudioBindingConstants.UPNP_DEVICE_TYPE,
device.getType().getType());
type);
logger.debug("Device services: {}", device.getServices().toString());
String deviceModel = device.getDetails().getModelDetails() != null
? device.getDetails().getModelDetails().getModelName()