From 500bb603db47952e8183600e39b6d5afad62b13d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 16 Aug 2019 13:49:23 +0200 Subject: [PATCH] Remove YangSyntaxErrorException throws YangSyntaxErrorException is a subclass of YangParserException, hence there is no need to declare it separately, as pointed out by Sonar. Change-Id: I22b72d1e79b283db7d77b9cc720c3b80054cd03d Signed-off-by: Robert Varga --- .../opendaylight/mdsal/yanglib/api/YangLibSupportFactory.java | 4 +--- .../mdsal/yanglib/rfc7895/YangModuleLibrarySupport.java | 3 +-- .../yanglib/rfc7895/YangModuleLibrarySupportFactory.java | 4 +--- .../mdsal/yanglib/rfc8525/YangLibrarySupport.java | 3 +-- .../mdsal/yanglib/rfc8525/YangLibrarySupportFactory.java | 3 +-- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/yanglib/mdsal-yanglib-api/src/main/java/org/opendaylight/mdsal/yanglib/api/YangLibSupportFactory.java b/yanglib/mdsal-yanglib-api/src/main/java/org/opendaylight/mdsal/yanglib/api/YangLibSupportFactory.java index 243ee90daf..2998c5689f 100644 --- a/yanglib/mdsal-yanglib-api/src/main/java/org/opendaylight/mdsal/yanglib/api/YangLibSupportFactory.java +++ b/yanglib/mdsal-yanglib-api/src/main/java/org/opendaylight/mdsal/yanglib/api/YangLibSupportFactory.java @@ -12,7 +12,6 @@ import java.io.IOException; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.yangtools.yang.model.parser.api.YangParserException; import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; -import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; /** * Main entrypoint for instantiating YangLibSupport implementations. @@ -21,6 +20,5 @@ import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException @NonNullByDefault public interface YangLibSupportFactory { - YangLibSupport createYangLibSupport(YangParserFactory parserFactory) throws YangSyntaxErrorException, - YangParserException, IOException; + YangLibSupport createYangLibSupport(YangParserFactory parserFactory) throws YangParserException, IOException; } diff --git a/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupport.java b/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupport.java index dfebd9cc49..1102b6d117 100644 --- a/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupport.java +++ b/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupport.java @@ -32,7 +32,6 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.parser.api.YangParserException; import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; -import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; @@ -46,7 +45,7 @@ public final class YangModuleLibrarySupport implements YangLibSupport { @Inject public YangModuleLibrarySupport(final @Reference YangParserFactory parserFactory) - throws YangSyntaxErrorException, YangParserException, IOException { + throws YangParserException, IOException { final YangModuleInfo yangLibModule = $YangModuleInfoImpl.getInstance(); // FIXME: DEFAULT_MODE should not be necessary, but it seems blueprint is still b0rked diff --git a/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupportFactory.java b/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupportFactory.java index 1479218217..bd0a4ab557 100644 --- a/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupportFactory.java +++ b/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupportFactory.java @@ -14,15 +14,13 @@ import org.opendaylight.mdsal.yanglib.api.YangLibSupport; import org.opendaylight.mdsal.yanglib.api.YangLibSupportFactory; import org.opendaylight.yangtools.yang.model.parser.api.YangParserException; import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; -import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; @MetaInfServices @NonNullByDefault public final class YangModuleLibrarySupportFactory implements YangLibSupportFactory { @Override public YangLibSupport createYangLibSupport(final YangParserFactory parserFactory) - throws YangSyntaxErrorException, YangParserException, IOException { + throws YangParserException, IOException { return new YangModuleLibrarySupport(parserFactory); - } } diff --git a/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibrarySupport.java b/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibrarySupport.java index 350693cb0d..d5d07c4590 100644 --- a/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibrarySupport.java +++ b/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibrarySupport.java @@ -34,7 +34,6 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.parser.api.YangParserException; import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; -import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; @@ -51,7 +50,7 @@ public final class YangLibrarySupport implements YangLibSupport { @Inject public YangLibrarySupport(final @Reference YangParserFactory parserFactory) - throws YangSyntaxErrorException, YangParserException, IOException { + throws YangParserException, IOException { final YangModuleInfo yangLibModule = $YangModuleInfoImpl.getInstance(); // FIXME: DEFAULT_MODE should not be necessary, but it seems blueprint is still b0rked diff --git a/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibrarySupportFactory.java b/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibrarySupportFactory.java index 66b63707ee..047df36f5b 100644 --- a/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibrarySupportFactory.java +++ b/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibrarySupportFactory.java @@ -14,14 +14,13 @@ import org.opendaylight.mdsal.yanglib.api.YangLibSupport; import org.opendaylight.mdsal.yanglib.api.YangLibSupportFactory; import org.opendaylight.yangtools.yang.model.parser.api.YangParserException; import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; -import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; @MetaInfServices @NonNullByDefault public final class YangLibrarySupportFactory implements YangLibSupportFactory { @Override public YangLibSupport createYangLibSupport(final YangParserFactory parserFactory) - throws YangSyntaxErrorException, YangParserException, IOException { + throws YangParserException, IOException { return new YangLibrarySupport(parserFactory); } } -- 2.36.6