From 20aee33014c8fd8c2012c4caf307516d34392dc7 Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Tue, 7 Jun 2016 09:13:55 +0200 Subject: [PATCH 1/1] Fix of build breakage caused by changes in Yangtools - use the RevisionSourceIdentifier implementation of SourceIdentifier abstract class Change-Id: I8ffceca436c1477a676e87f69e31ce7c4722c061 Signed-off-by: Ivan Hrasko --- .../netconf/NetconfConnectorModule.java | 7 +++-- .../netconf/LibraryModulesSchemas.java | 5 ++-- .../sal/connect/netconf/NetconfDevice.java | 4 ++- .../netconf/LibraryModulesSchemasTest.java | 25 +++++++++-------- .../connect/netconf/NetconfDeviceTest.java | 7 +++-- ...ngLibrarySchemaYangSourceProviderTest.java | 5 ++-- .../test/tool/NetconfDeviceSimulator.java | 9 +++--- .../yanglib/impl/YangLibServiceImpl.java | 7 ++--- .../yanglib/impl/YangLibProviderTest.java | 28 +++++++++++-------- 9 files changed, 57 insertions(+), 40 deletions(-) diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java index f6c6f02443..47da05f36b 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java @@ -53,6 +53,7 @@ import org.opendaylight.protocol.framework.TimedReconnectStrategy; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Host; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory; import org.opendaylight.yangtools.yang.model.repo.api.SchemaRepository; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceFilter; @@ -239,8 +240,10 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co } if (userCapabilities.isPresent()) { for (QName qname : userCapabilities.get().getModuleBasedCaps()) { - final SourceIdentifier sourceIdentifier = new SourceIdentifier(qname.getLocalName(), qname.getFormattedRevision()); - dto.getSchemaRegistry().registerSchemaSource(DEFAULT_CACHE, PotentialSchemaSource.create(sourceIdentifier, YangTextSchemaSource.class, LOCAL_IO_FALLBACK_COST)); + final SourceIdentifier sourceIdentifier = RevisionSourceIdentifier + .create(qname.getLocalName(), qname.getFormattedRevision()); + dto.getSchemaRegistry().registerSchemaSource(DEFAULT_CACHE, PotentialSchemaSource + .create(sourceIdentifier, YangTextSchemaSource.class, LOCAL_IO_FALLBACK_COST)); } } } diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java index 6106a758eb..dd6f855d7a 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java @@ -44,6 +44,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult; import org.opendaylight.yangtools.yang.data.impl.schema.transform.dom.parser.DomToNormalizedNodeParserFactory; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -244,8 +245,8 @@ public class LibraryModulesSchemas { final SourceIdentifier sourceId = revision.isPresent() - ? new SourceIdentifier(moduleName, revision.get()) - : new SourceIdentifier(moduleName); + ? RevisionSourceIdentifier.create(moduleName, revision.get()) + : RevisionSourceIdentifier.create(moduleName); try { return Optional.>of(new AbstractMap.SimpleImmutableEntry<>( diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java index a590c10850..c5e36cfc44 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java @@ -48,6 +48,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev15 import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.repo.api.MissingSchemaSourceException; +import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory; import org.opendaylight.yangtools.yang.model.repo.api.SchemaResolutionException; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceRepresentation; @@ -69,7 +70,8 @@ public class NetconfDevice implements RemoteDevice QNAME_TO_SOURCE_ID_FUNCTION = new Function() { @Override public SourceIdentifier apply(final QName input) { - return new SourceIdentifier(input.getLocalName(), Optional.fromNullable(input.getFormattedRevision())); + return RevisionSourceIdentifier + .create(input.getLocalName(), Optional.fromNullable(input.getFormattedRevision())); } }; diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java index 26e48c6f8e..32aa12870a 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java @@ -13,10 +13,9 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Collections; import java.util.Map; -import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Test; -import org.opendaylight.netconf.sal.connect.netconf.LibraryModulesSchemas; +import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; public class LibraryModulesSchemasTest { @@ -41,20 +40,22 @@ public class LibraryModulesSchemasTest { final Map resolvedModulesSchema = libraryModulesSchemas.getAvailableModels(); Assert.assertThat(resolvedModulesSchema.size(), is(3)); - Assert.assertTrue(resolvedModulesSchema.containsKey(new SourceIdentifier("module-with-revision", "2014-04-08"))); + Assert.assertTrue(resolvedModulesSchema.containsKey(RevisionSourceIdentifier.create("module-with-revision", + "2014-04-08"))); Assert.assertThat(resolvedModulesSchema.get( - new SourceIdentifier("module-with-revision", "2014-04-08")), + RevisionSourceIdentifier.create("module-with-revision", "2014-04-08")), is(new URL("http://localhost:8181/yanglib/schemas/module-with-revision/2014-04-08"))); Assert.assertTrue(resolvedModulesSchema.containsKey( - new SourceIdentifier("another-module-with-revision", "2013-10-21"))); + RevisionSourceIdentifier.create("another-module-with-revision", "2013-10-21"))); Assert.assertThat(resolvedModulesSchema.get( - new SourceIdentifier("another-module-with-revision", "2013-10-21")), + RevisionSourceIdentifier.create("another-module-with-revision", "2013-10-21")), is(new URL("http://localhost:8181/yanglib/schemas/another-module-with-revision/2013-10-21"))); - Assert.assertTrue(resolvedModulesSchema.containsKey(new SourceIdentifier("module-without-revision"))); + Assert.assertTrue(resolvedModulesSchema.containsKey( + RevisionSourceIdentifier.create("module-without-revision"))); Assert.assertThat(resolvedModulesSchema.get( - new SourceIdentifier("module-without-revision")), + RevisionSourceIdentifier.create("module-without-revision")), is(new URL("http://localhost:8181/yanglib/schemas/module-without-revision/"))); } @@ -66,10 +67,12 @@ public class LibraryModulesSchemasTest { final Map resolvedModulesSchema = libraryModulesSchemas.getAvailableModels(); Assert.assertThat(resolvedModulesSchema.size(), is(1)); - Assert.assertFalse(resolvedModulesSchema.containsKey(new SourceIdentifier("module-with-bad-url"))); Assert.assertFalse(resolvedModulesSchema.containsKey( - new SourceIdentifier("module-with-bad-revision", "bad-revision"))); - Assert.assertTrue(resolvedModulesSchema.containsKey(new SourceIdentifier("good-ol-module"))); + RevisionSourceIdentifier.create("module-with-bad-url"))); + Assert.assertFalse(resolvedModulesSchema.containsKey( + RevisionSourceIdentifier.create("module-with-bad-revision", "bad-revision"))); + Assert.assertTrue(resolvedModulesSchema.containsKey( + RevisionSourceIdentifier.create("good-ol-module"))); } diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java index 8c14f8cd1b..23e86f3aed 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java @@ -58,6 +58,7 @@ import org.opendaylight.yangtools.yang.model.api.ModuleImport; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.repo.api.MissingSchemaSourceException; +import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory; import org.opendaylight.yangtools.yang.model.repo.api.SchemaResolutionException; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; @@ -92,10 +93,12 @@ public class NetconfDeviceTest { public static final String TEST_NAMESPACE = "test:namespace"; public static final String TEST_MODULE = "test-module"; public static final String TEST_REVISION = "2013-07-22"; - public static final SourceIdentifier TEST_SID = new SourceIdentifier(TEST_MODULE, Optional.of(TEST_REVISION)); + public static final SourceIdentifier TEST_SID = + RevisionSourceIdentifier.create(TEST_MODULE, Optional.of(TEST_REVISION)); public static final String TEST_CAPABILITY = TEST_NAMESPACE + "?module=" + TEST_MODULE + "&revision=" + TEST_REVISION; - public static final SourceIdentifier TEST_SID2 = new SourceIdentifier(TEST_MODULE + "2", Optional.of(TEST_REVISION)); + public static final SourceIdentifier TEST_SID2 = + RevisionSourceIdentifier.create(TEST_MODULE + "2", Optional.of(TEST_REVISION)); public static final String TEST_CAPABILITY2 = TEST_NAMESPACE + "?module=" + TEST_MODULE + "2" + "&revision=" + TEST_REVISION; private static final NetconfStateSchemas.NetconfStateSchemasResolver stateSchemasResolver = new NetconfStateSchemas.NetconfStateSchemasResolver() { diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/YangLibrarySchemaYangSourceProviderTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/YangLibrarySchemaYangSourceProviderTest.java index 15f0ab3c6c..916a5f8e26 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/YangLibrarySchemaYangSourceProviderTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/YangLibrarySchemaYangSourceProviderTest.java @@ -12,6 +12,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; +import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; @@ -24,7 +25,7 @@ public class YangLibrarySchemaYangSourceProviderTest { @Before public void setUp() throws Exception { final URL url = getClass().getResource("/schemas/config-test-rpc.yang"); - workingSid = new SourceIdentifier("abc", Optional.absent()); + workingSid = RevisionSourceIdentifier.create("abc", Optional.absent()); final Map sourceIdentifierURLMap = Collections.singletonMap(workingSid, url); final RemoteDeviceId id = new RemoteDeviceId("id", new InetSocketAddress("localhost", 22)); yangLibrarySchemaYangSourceProvider = new YangLibrarySchemaYangSourceProvider(id, sourceIdentifierURLMap); @@ -53,6 +54,6 @@ public class YangLibrarySchemaYangSourceProviderTest { @Test(expected = IllegalArgumentException.class) public void testGetSourceNotAvailable() throws Exception { - yangLibrarySchemaYangSourceProvider.getSource(new SourceIdentifier("aaaaa", "0000-00-00")); + yangLibrarySchemaYangSourceProvider.getSource(RevisionSourceIdentifier.create("aaaaa", "0000-00-00")); } } \ No newline at end of file diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java index 50cbf2d647..8665509bdb 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java @@ -59,6 +59,7 @@ import org.opendaylight.netconf.ssh.SshProxyServerConfigurationBuilder; import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SchemaResolutionException; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceFilter; @@ -328,16 +329,16 @@ public class NetconfDeviceSimulator implements Closeable { } private void addDefaultSchemas(final SharedSchemaRepository consumer) { - SourceIdentifier sId = new SourceIdentifier("ietf-netconf-monitoring", "2010-10-04"); + SourceIdentifier sId = RevisionSourceIdentifier.create("ietf-netconf-monitoring", "2010-10-04"); registerSource(consumer, "/META-INF/yang/ietf-netconf-monitoring.yang", sId); - sId = new SourceIdentifier("ietf-netconf-monitoring-extension", "2013-12-10"); + sId = RevisionSourceIdentifier.create("ietf-netconf-monitoring-extension", "2013-12-10"); registerSource(consumer, "/META-INF/yang/ietf-netconf-monitoring-extension.yang", sId); - sId = new SourceIdentifier("ietf-yang-types", "2010-09-24"); + sId = RevisionSourceIdentifier.create("ietf-yang-types", "2010-09-24"); registerSource(consumer, "/META-INF/yang/ietf-yang-types.yang", sId); - sId = new SourceIdentifier("ietf-inet-types", "2010-09-24"); + sId = RevisionSourceIdentifier.create("ietf-inet-types", "2010-09-24"); registerSource(consumer, "/META-INF/yang/ietf-inet-types.yang", sId); } diff --git a/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibServiceImpl.java b/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibServiceImpl.java index 5038b0ccdc..4e7b890e9a 100644 --- a/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibServiceImpl.java +++ b/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibServiceImpl.java @@ -13,11 +13,8 @@ import com.google.common.base.Preconditions; import com.google.common.io.ByteStreams; import com.google.common.util.concurrent.CheckedFuture; import java.io.IOException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; import org.opendaylight.yanglib.api.YangLibService; +import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; @@ -47,7 +44,7 @@ public class YangLibServiceImpl implements YangLibService { Preconditions.checkNotNull(schemaRepository, "Schema repository is not initialized"); LOG.debug("Attempting load for schema source {}:{}", name, revision); final SourceIdentifier sourceId = - new SourceIdentifier(name, Optional.fromNullable(revision.equals("") ? null : revision)); + RevisionSourceIdentifier.create(name, Optional.fromNullable(revision.equals("") ? null : revision)); final CheckedFuture sourceFuture = schemaRepository.getSchemaSource(sourceId, YangTextSchemaSource.class); diff --git a/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java b/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java index 66114e2119..1ca410b293 100644 --- a/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java +++ b/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java @@ -11,8 +11,6 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; @@ -41,7 +39,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.librar import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.module.list.ModuleKey; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.YangIdentifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; +import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; import org.opendaylight.yangtools.yang.model.repo.api.YinSchemaSourceRepresentation; import org.opendaylight.yangtools.yang.model.repo.spi.PotentialSchemaSource; @@ -77,11 +75,13 @@ public class YangLibProviderTest { List> list = new ArrayList<>(); list.add( - PotentialSchemaSource.create(new SourceIdentifier("no-revision"), + PotentialSchemaSource.create( + RevisionSourceIdentifier.create("no-revision"), YangTextSchemaSource.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue())); list.add( - PotentialSchemaSource.create(new SourceIdentifier("with-revision", "2016-04-28"), + PotentialSchemaSource.create( + RevisionSourceIdentifier.create("with-revision", "2016-04-28"), YangTextSchemaSource.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue())); when(writeTransaction.submit()).thenReturn(Futures.immediateCheckedFuture(null)); @@ -126,11 +126,13 @@ public class YangLibProviderTest { // expected behavior is to do nothing potentialSources = new ArrayList<>(); potentialSources.add( - PotentialSchemaSource.create(new SourceIdentifier("yin-source-representation"), + PotentialSchemaSource.create( + RevisionSourceIdentifier.create("yin-source-representation"), YinSchemaSourceRepresentation.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue())); potentialSources.add( - PotentialSchemaSource.create(new SourceIdentifier("asts-schema-source"), + PotentialSchemaSource.create( + RevisionSourceIdentifier.create("asts-schema-source"), ASTSchemaSource.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue())); yangLibProvider.schemaSourceRegistered(potentialSources); @@ -138,7 +140,8 @@ public class YangLibProviderTest { // add yang schema source to list potentialSources.add( - PotentialSchemaSource.create(new SourceIdentifier("yang-schema-source"), + PotentialSchemaSource.create( + RevisionSourceIdentifier.create("yang-schema-source"), YangTextSchemaSource.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue())); when(dataBroker.newWriteOnlyTransaction()).thenReturn(writeTransaction); @@ -158,7 +161,8 @@ public class YangLibProviderTest { yangLibProvider.onSessionInitiated(context); final PotentialSchemaSource nonYangSource = - PotentialSchemaSource.create(new SourceIdentifier("yin-source-representation"), + PotentialSchemaSource.create( + RevisionSourceIdentifier.create("yin-source-representation"), YinSchemaSourceRepresentation.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue()); yangLibProvider.schemaSourceUnregistered(nonYangSource); @@ -178,7 +182,8 @@ public class YangLibProviderTest { when(writeTransaction.submit()).thenReturn(Futures.immediateCheckedFuture(null)); PotentialSchemaSource yangUnregistererSource = - PotentialSchemaSource.create(new SourceIdentifier("unregistered-yang-schema-without-revision"), + PotentialSchemaSource.create( + RevisionSourceIdentifier.create("unregistered-yang-schema-without-revision"), YangTextSchemaSource.class, PotentialSchemaSource.Costs.LOCAL_IO.getValue()); yangLibProvider.schemaSourceUnregistered(yangUnregistererSource); @@ -193,7 +198,8 @@ public class YangLibProviderTest { verify(writeTransaction).submit(); yangUnregistererSource = - PotentialSchemaSource.create(new SourceIdentifier("unregistered-yang-with-revision", "2016-04-28"), + PotentialSchemaSource.create( + RevisionSourceIdentifier.create("unregistered-yang-with-revision", "2016-04-28"), YangTextSchemaSource.class, PotentialSchemaSource.Costs.LOCAL_IO.getValue()); yangLibProvider.schemaSourceUnregistered(yangUnregistererSource); -- 2.36.6