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

Removal of reference to PaperUI (#9905)

Browse Source 
Related to #8607.

In some cases removed information that is actually generic information and should not be in binding readme.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
This commit is contained in:
Hilbrand Bouwkamp
2021-01-22 09:51:24 +01:00
committed by GitHub
parent ca6d62ddeb
commit 8889762bef
17 changed files with 56 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/serialization/NeeoDeviceSerializer.java
View File

@@ -19,7 +19,6 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.thing.Thing;
@@ -111,8 +110,8 @@ public class NeeoDeviceSerializer implements JsonSerializer<NeeoDevice>, JsonDes
try {
return new NeeoDevice(uid, driverVersion, devType,
manufacturer == null || StringUtils.isEmpty(manufacturer) ? NeeoUtil.NOTAVAILABLE : manufacturer,
name, Arrays.asList(channels), timing,
manufacturer == null || manufacturer.isEmpty() ? NeeoUtil.NOTAVAILABLE : manufacturer, name,
Arrays.asList(channels), timing,
deviceCapabilities == null ? null : Arrays.asList(deviceCapabilities), specificName, iconName);
} catch (NullPointerException | IllegalArgumentException e) {
throw new JsonParseException(e);
@@ -146,13 +145,13 @@ public class NeeoDeviceSerializer implements JsonSerializer<NeeoDevice>, JsonDes
jsonObject.addProperty("thingType", uid.getThingType());
if (StringUtils.equalsIgnoreCase(NeeoConstants.NEEOIO_BINDING_ID, uid.getBindingId())) {
if (NeeoConstants.NEEOIO_BINDING_ID.equalsIgnoreCase(uid.getBindingId())) {
jsonObject.addProperty("thingStatus", uid.getThingType().toUpperCase());
}
final ServiceContext localContext = context;
if (localContext != null) {
if (!StringUtils.equalsIgnoreCase(NeeoConstants.NEEOIO_BINDING_ID, uid.getBindingId())) {
if (!NeeoConstants.NEEOIO_BINDING_ID.equalsIgnoreCase(uid.getBindingId())) {
final Thing thing = localContext.getThingRegistry().get(device.getUid().asThingUID());
jsonObject.addProperty("thingStatus",
thing == null ? ThingStatus.UNKNOWN.name() : thing.getStatus().name());
@@ -167,12 +166,12 @@ public class NeeoDeviceSerializer implements JsonSerializer<NeeoDevice>, JsonDes
if (jo.has("groupId") && jo.has("itemLabel")) {
final String groupId = jo.get("groupId").getAsString();
final String groupLabel = NeeoUtil.getGroupLabel(thingType, groupId);
if (StringUtils.isNotEmpty(groupLabel)) {
if (groupLabel != null && !groupLabel.isEmpty()) {
final JsonElement itemLabel = jo.remove("itemLabel");
jo.addProperty("itemLabel", groupLabel + "#" + itemLabel.getAsString());
} else if (StringUtils.isNotEmpty("groupId")) {
} else if (groupId != null && !groupId.isEmpty()) {
// have a groupid but no group definition found (usually error on binding)
// just default to "Others" like the Paperui does.
// just default to "Others".
final JsonElement itemLabel = jo.remove("itemLabel");
jo.addProperty("itemLabel", "Others#" + itemLabel.getAsString());
}