From 51cea429d220de41d4383e789512043b2bad1707 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 12 Jun 2015 19:04:39 +0200 Subject: [PATCH] Remove use of deprecated parser method This simplifies SchemaContext construction in test. Change-Id: I784075dd28a36aae9e679abbdb8370d9ea415388 Signed-off-by: Robert Varga --- .../yang/data/impl/schema/tree/TestModel.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/TestModel.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/TestModel.java index 20aace6a39..fe66a67c34 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/TestModel.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/TestModel.java @@ -7,16 +7,16 @@ */ package org.opendaylight.yangtools.yang.data.impl.schema.tree; +import com.google.common.io.Resources; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collections; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; -import java.io.InputStream; -import java.util.Collections; -import java.util.Set; - public class TestModel { public static final QName TEST_QNAME = QName.create("urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test", "2014-03-13", @@ -36,16 +36,15 @@ public class TestModel { public static final InputStream getDatastoreTestInputStream() { - return getInputStream(DATASTORE_TEST_YANG); - } - - private static InputStream getInputStream(final String resourceName) { return TestModel.class.getResourceAsStream(DATASTORE_TEST_YANG); } public static SchemaContext createTestContext() { YangParserImpl parser = new YangParserImpl(); - Set modules = parser.parseYangModelsFromStreams(Collections.singletonList(getDatastoreTestInputStream())); - return parser.resolveSchemaContext(modules); + try { + return parser.parseSources(Collections.singleton(Resources.asByteSource(TestModel.class.getResource(DATASTORE_TEST_YANG)))); + } catch (IOException | YangSyntaxErrorException e) { + throw new IllegalStateException("Failed to create context", e); + } } } -- 2.36.6