From 6c95898df7a932ba15f12ca900ed0646a1e165f8 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 28 May 2020 07:52:46 +0200 Subject: [PATCH] Remove use of getDataChildByName() findDataChildByName() provides a proper Optional-based interface, use that instead of the deprecated method. Change-Id: I7813e308f1fac5a07cfa9eba2f96e5df981378cf Signed-off-by: Robert Varga --- .../blueprint/ext/DataStoreAppConfigDefaultXMLReader.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java index 4f8140eaa6..6f323716ee 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java @@ -117,7 +117,10 @@ public class DataStoreAppConfigDefaultXMLReader { checkNotNull(module, "%s: Could not obtain the module schema for namespace %s, revision %s", logName, bindingContext.bindingQName.getNamespace(), bindingContext.bindingQName.getRevision()); - DataSchemaNode dataSchema = module.getDataChildByName(bindingContext.bindingQName); + QName qname = bindingContext.bindingQName; + DataSchemaNode dataSchema = module.findDataChildByName(qname).orElseThrow( + () -> new ConfigXMLReaderException(logName + ": Could not obtain the schema for " + qname)); + checkNotNull(dataSchema, "%s: Could not obtain the schema for %s", logName, bindingContext.bindingQName); checkCondition(bindingContext.schemaType.isAssignableFrom(dataSchema.getClass()), -- 2.36.6