From: Robert Varga Date: Thu, 4 Apr 2019 20:32:47 +0000 (+0200) Subject: Bump yangtools to 3.0.0 X-Git-Tag: release/sodium~45 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=bc3a190f7f382c1cad702dad577cc14dca90cd82;p=bgpcep.git Bump yangtools to 3.0.0 This bumps yangtools to 3.0.0, making minor adjustements to cope with the API changes. We also remove checkstyle-logging, as it no longer ships from yangtools -- spotbugs is more than competent to handle the validation provided by checkstyle-logging. Change-Id: I6c4dedcf46a0761d5e2a65fb1a1a25c2d06255fc Signed-off-by: Robert Varga --- diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java index 09bc13edb6..f8e04e34ec 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java @@ -325,8 +325,7 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn return; } - final DataTreeCandidateNode modifiedAttrs = table.getModifiedChild(ATTRIBUTES_NID); - if (modifiedAttrs != null) { + table.getModifiedChild(ATTRIBUTES_NID).ifPresent(modifiedAttrs -> { final YangInstanceIdentifier effAttrsPath = effectiveTablePath.node(ATTRIBUTES_NID); final Optional> optAttrsAfter = modifiedAttrs.getDataAfter(); if (optAttrsAfter.isPresent()) { @@ -335,10 +334,9 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn } else { tx.delete(LogicalDatastoreType.OPERATIONAL, effAttrsPath); } - } + }); - final DataTreeCandidateNode modifiedRoutes = table.getModifiedChild(ROUTES_NID); - if (modifiedRoutes != null) { + table.getModifiedChild(ROUTES_NID).ifPresent(modifiedRoutes -> { final RIBSupport ribSupport = ribContext.getRibSupport(); switch (modifiedRoutes.getModificationType()) { case APPEARED: @@ -365,7 +363,7 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn LOG.warn("Ignoring modified routes {}", modifiedRoutes); break; } - } + }); } private void writeTable(final DOMDataWriteTransaction tx, final RIBSupportContext ribContext, diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java index 09ad5be727..723ef966ef 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java @@ -374,17 +374,12 @@ public abstract class AbstractRIBSupport< @Override public final Collection changedRoutes(final DataTreeCandidateNode routes) { - final DataTreeCandidateNode myRoutes = routes.getModifiedChild(this.routesContainerIdentifier); - if (myRoutes == null) { - return Collections.emptySet(); - } - final DataTreeCandidateNode routesMap = myRoutes.getModifiedChild(routeNid()); - if (routesMap == null) { - return Collections.emptySet(); - } - // Well, given the remote possibility of augmentation, we should perform a filter here, - // to make sure the type matches what routeType() reports. - return routesMap.getChildNodes(); + return routes.getModifiedChild(this.routesContainerIdentifier) + .flatMap(myRoutes -> myRoutes.getModifiedChild(routeNid())) + // Well, given the remote possibility of augmentation, we should perform a filter here, + // to make sure the type matches what routeType() reports. + .map(DataTreeCandidateNode::getChildNodes) + .orElse(Collections.emptySet()); } @Override diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java index ef803b9cbe..32429287e0 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java @@ -12,7 +12,7 @@ import static junit.framework.TestCase.assertFalse; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; @@ -108,13 +108,13 @@ public class RIBSupportTest extends AbstractConcurrentDataBrokerTest { this.subTree = Mockito.mock(DataTreeCandidateNode.class); final DataTreeCandidateNode emptyNode = Mockito.mock(DataTreeCandidateNode.class); final DataTreeCandidateNode node = Mockito.mock(DataTreeCandidateNode.class); - doReturn(null).when(this.emptyTree).getModifiedChild(IPV4_ROUTES_IDENTIFIER); + doReturn(Optional.empty()).when(this.emptyTree).getModifiedChild(IPV4_ROUTES_IDENTIFIER); - doReturn(emptyNode).when(this.emptySubTree).getModifiedChild(IPV4_ROUTES_IDENTIFIER); - doReturn(null).when(emptyNode).getModifiedChild(new NodeIdentifier(Ipv4Route.QNAME)); + doReturn(Optional.of(emptyNode)).when(this.emptySubTree).getModifiedChild(IPV4_ROUTES_IDENTIFIER); + doReturn(Optional.empty()).when(emptyNode).getModifiedChild(new NodeIdentifier(Ipv4Route.QNAME)); - doReturn(node).when(this.subTree).getModifiedChild(IPV4_ROUTES_IDENTIFIER); - doReturn(node).when(node).getModifiedChild(new NodeIdentifier(Ipv4Route.QNAME)); + doReturn(Optional.of(node)).when(this.subTree).getModifiedChild(IPV4_ROUTES_IDENTIFIER); + doReturn(Optional.of(node)).when(node).getModifiedChild(new NodeIdentifier(Ipv4Route.QNAME)); final Collection emptyCollection = new HashSet<>(); doReturn(emptyCollection).when(node).getChildNodes(); diff --git a/binding-parent/pom.xml b/binding-parent/pom.xml index 6e7517b7da..a1780c8c10 100644 --- a/binding-parent/pom.xml +++ b/binding-parent/pom.xml @@ -42,13 +42,6 @@ checkstyle.violationSeverity=error - - - org.opendaylight.yangtools - checkstyle-logging - 2.1.8 - - com.github.spotbugs diff --git a/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImpl.java b/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImpl.java index b3a53eec6d..111a3b59b5 100644 --- a/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImpl.java +++ b/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImpl.java @@ -30,7 +30,6 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; import java.util.stream.Collectors; import javax.annotation.concurrent.GuardedBy; -import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; @@ -126,8 +125,7 @@ public final class ConfigLoaderImpl implements ConfigLoader, AutoCloseable { .findDataSchemaNode(this.schemaContext, config.getSchemaPath()); try (XmlParserStream xmlParser = XmlParserStream.create(streamWriter, this.schemaContext, schemaNode)) { xmlParser.parse(reader); - } catch (final URISyntaxException | XMLStreamException | IOException | ParserConfigurationException - | SAXException e) { + } catch (final URISyntaxException | XMLStreamException | IOException | SAXException e) { LOG.warn("Failed to parse xml", e); } finally { reader.close(); diff --git a/features/bgp/odl-bgpcep-bgp-dependencies/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp-dependencies/src/main/feature/feature.xml index 53f222936f..5371262ad3 100644 --- a/features/bgp/odl-bgpcep-bgp-dependencies/src/main/feature/feature.xml +++ b/features/bgp/odl-bgpcep-bgp-dependencies/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-yangtools-data-api + odl-yangtools-data-api diff --git a/parent/pom.xml b/parent/pom.xml index 0d1fa72de8..59a9932b18 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -51,7 +51,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.1.8 + 3.0.0 import pom @@ -162,13 +162,6 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - org.opendaylight.yangtools - checkstyle-logging - 2.1.8 - - checkstyle.violationSeverity=error diff --git a/testtool-parent/pom.xml b/testtool-parent/pom.xml index 7840868a1b..6a58996f14 100644 --- a/testtool-parent/pom.xml +++ b/testtool-parent/pom.xml @@ -48,13 +48,6 @@ checkstyle.violationSeverity=error - - - org.opendaylight.yangtools - checkstyle-logging - 2.1.8 - - com.github.spotbugs