OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

slightly cleaner nullness handling (don't split contains and get) (#885) 

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
pull/893/head
Markus Rathgeb 2019-06-20 21:33:36 +02:00 committed by Kai Kreuzer
parent fe9b060391
commit 2ed5110668
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/StateDescriptionConverter.java
View File

@ -16,6 +16,7 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.eclipse.smarthome.config.xml.util.ConverterAttributeMapValidator;
import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller;
@ -92,19 +93,10 @@ public class StateDescriptionConverter extends GenericUnmarshaller<StateDescript
private StateOption toChannelStateOption(NodeValue nodeValue) throws ConversionException {
if ("option".equals(nodeValue.getNodeName())) {
String value;
String label;
Map<String, String> attributes = nodeValue.getAttributes();
if ((attributes != null) && (attributes.containsKey("value"))) {
value = attributes.get("value");
} else {
throw new ConversionException("The node 'option' requires the attribute 'value'!");
}
label = (String) nodeValue.getValue();
return new StateOption(value, label);
final Map<String, String> attributes = nodeValue.getAttributes();
final String value = Optional.ofNullable(attributes).map(entry -> entry.get("value"))
.orElseThrow(() -> new ConversionException("The node 'option' requires the attribute 'value'!"));
return new StateOption(value, nodeValue.getValue().toString());
}
throw new ConversionException("Unknown type in the list of 'options'!");