From 5e22412702965a754fc0e392f263416365e0a4df Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 8 Nov 2022 21:21:37 +0100 Subject: [PATCH] Clean up NetconfDeviceSimulator.addModuleCapability() Use local variable type inference to shorten the code. Also use different messages for acquire and read. Change-Id: Ic429328469271419478e93e24bf02044d0ff6a8a Signed-off-by: Robert Varga --- .../test/tool/NetconfDeviceSimulator.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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 8407b94064..c60f5116c8 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 @@ -343,18 +343,19 @@ public class NetconfDeviceSimulator implements Closeable { private static void addModuleCapability(final SharedSchemaRepository consumer, final Set capabilities, final ModuleLike module) { - final SourceIdentifier moduleSourceIdentifier = new SourceIdentifier(module.getName(), + final var sourceId = new SourceIdentifier(module.getName(), module.getRevision().map(Revision::toString).orElse(null)); - try { - final String moduleContent = consumer.getSchemaSource(moduleSourceIdentifier, YangTextSchemaSource.class) - .get().asCharSource(StandardCharsets.UTF_8).read(); - capabilities.add(new YangModuleCapability(module, moduleContent)); - //IOException would be thrown in creating SchemaContext already - } catch (final ExecutionException | InterruptedException | IOException e) { + final String moduleContent; + try { + moduleContent = consumer.getSchemaSource(sourceId, YangTextSchemaSource.class).get() + .asCharSource(StandardCharsets.UTF_8).read(); + } catch (ExecutionException | InterruptedException | IOException e) { throw new IllegalStateException( - "Cannot retrieve schema source for module " + moduleSourceIdentifier + " from schema repository", e); + "Cannot retrieve schema source for module " + sourceId + " from schema repository", e); } + + capabilities.add(new YangModuleCapability(module, moduleContent)); } private static void registerSource(final SharedSchemaRepository consumer, final String resource, -- 2.36.6