From be7e59c8bd5d66a7643dc4dcfb05f4cd94925cba Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 7 Nov 2018 12:39:29 +0100 Subject: [PATCH] Hide DOMMountPointServiceImpl.registerMountPoint implementation This adds a trivial package-protected method which holds the implementation, allowing us to short-circuit some casts. Change-Id: I41d792c50d87638fc6ba51433cd26bf68980fca2 Signed-off-by: Robert Varga (cherry picked from commit e5bd339c5b81732da4496010b03533ec247455fa) --- .../broker/impl/mount/DOMMountPointServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java index 90d513aa9c..ce18d54261 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java @@ -97,19 +97,22 @@ public class DOMMountPointServiceImpl implements DOMMountPointService { * public {@link #createMountPoint} interface. As such, this method expects the {@code mountPoint} param * to be of type {@link SimpleDOMMountPoint}. */ - @SuppressWarnings("unchecked") @Deprecated public ObjectRegistration registerMountPoint(final DOMMountPoint mountPoint) { Preconditions.checkArgument(mountPoint instanceof SimpleDOMMountPoint, "Expected SimpleDOMMountPoint"); + return doRegisterMountPoint((SimpleDOMMountPoint) mountPoint); + } + @SuppressWarnings("unchecked") + ObjectRegistration doRegisterMountPoint(final SimpleDOMMountPoint mountPoint) { final org.opendaylight.mdsal.dom.api.DOMMountPointService.DOMMountPointBuilder delegateBuilder = - delegate.createMountPoint(mountPoint.getIdentifier()); + delegate.createMountPoint(mountPoint.getIdentifier()); if (mountPoint.getSchemaContext() != null) { delegateBuilder.addInitialSchemaContext(mountPoint.getSchemaContext()); } - ((SimpleDOMMountPoint)mountPoint).getAllServices().forEach( + mountPoint.getAllServices().forEach( entry -> delegateBuilder.addService((Class)entry.getKey(), entry.getValue())); final ObjectRegistration delegateReg = delegateBuilder.register(); @@ -153,7 +156,7 @@ public class DOMMountPointServiceImpl implements DOMMountPointService { public ObjectRegistration register() { Preconditions.checkState(mountPoint == null, "Mount point is already built."); mountPoint = SimpleDOMMountPoint.create(path, services, schemaContext); - return registerMountPoint(mountPoint); + return doRegisterMountPoint(mountPoint); } } } -- 2.36.6