X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-common-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fcommon%2Fimpl%2Futil%2Fcompat%2FDataSchemaContainerProxy.java;h=9da99b1f2710b0e47214d68c4eb176c5dbdb4e68;hb=refs%2Fchanges%2F29%2F83829%2F3;hp=d243c888bd155924db61fb65d5308975cc0939a8;hpb=35189191ea7d4fc663da81cabacacfa4f7ace313;p=controller.git diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataSchemaContainerProxy.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataSchemaContainerProxy.java index d243c888bd..9da99b1f27 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataSchemaContainerProxy.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataSchemaContainerProxy.java @@ -10,8 +10,8 @@ package org.opendaylight.controller.md.sal.common.impl.util.compat; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.Optional; import java.util.Set; - import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -19,22 +19,23 @@ import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UsesNode; +@Deprecated class DataSchemaContainerProxy implements DataNodeContainer { private final Set realChildSchemas; private final Map mappedChildSchemas; - public DataSchemaContainerProxy(final Set realChildSchema) { + DataSchemaContainerProxy(final Set realChildSchema) { realChildSchemas = realChildSchema; - mappedChildSchemas = new HashMap(); - for(DataSchemaNode schema : realChildSchemas) { - mappedChildSchemas.put(schema.getQName(),schema); + mappedChildSchemas = new HashMap<>(); + for (DataSchemaNode schema : realChildSchemas) { + mappedChildSchemas.put(schema.getQName(), schema); } } @Override - public DataSchemaNode getDataChildByName(final QName name) { - return mappedChildSchemas.get(name); + public Optional findDataChildByName(final QName name) { + return Optional.ofNullable(mappedChildSchemas.get(name)); } @Override @@ -42,11 +43,6 @@ class DataSchemaContainerProxy implements DataNodeContainer { return realChildSchemas; } - @Override - public DataSchemaNode getDataChildByName(final String arg0) { - throw new UnsupportedOperationException(); - } - @Override public Set getGroupings() { return Collections.emptySet(); @@ -61,5 +57,4 @@ class DataSchemaContainerProxy implements DataNodeContainer { public Set getUses() { return Collections.emptySet(); } - }