From: Robert Varga Date: Sun, 4 Nov 2018 23:59:58 +0000 (+0100) Subject: Migrate sal-rest-docgen to MD-SAL APIs X-Git-Tag: release/neon~107 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=376150894b137d05800ef3ef924d58336362d0e3;hp=8e29cdd1bf6d70fb3cb34ba1e89c3433a3e3cbd6;p=netconf.git Migrate sal-rest-docgen to MD-SAL APIs This performs a straight-forward migration of sal-rest-docgen. Change-Id: I18dd4382e16b0716b8551ead1cf15abb9dc14eca Signed-off-by: Robert Varga --- diff --git a/restconf/sal-rest-docgen/pom.xml b/restconf/sal-rest-docgen/pom.xml index 89b21db82c..5052092a0a 100644 --- a/restconf/sal-rest-docgen/pom.xml +++ b/restconf/sal-rest-docgen/pom.xml @@ -41,8 +41,8 @@ - org.opendaylight.controller - sal-core-api + org.opendaylight.mdsal + mdsal-dom-api org.opendaylight.yangtools diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/MountPointSwaggerGeneratorDraft02.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/MountPointSwaggerGeneratorDraft02.java index f0c7d19017..19373bad80 100644 --- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/MountPointSwaggerGeneratorDraft02.java +++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/MountPointSwaggerGeneratorDraft02.java @@ -7,9 +7,8 @@ */ package org.opendaylight.netconf.sal.rest.doc.impl; -import java.util.Objects; import java.util.Optional; -import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; +import org.opendaylight.mdsal.dom.api.DOMMountPointService; import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.netconf.sal.rest.doc.mountpoints.MountPointSwagger; @@ -22,8 +21,9 @@ public class MountPointSwaggerGeneratorDraft02 extends BaseYangSwaggerGeneratorD private final MountPointSwagger mountPointSwagger; - public MountPointSwaggerGeneratorDraft02(DOMSchemaService schemaService, DOMMountPointService mountService) { - super(Optional.of(Objects.requireNonNull(schemaService))); + public MountPointSwaggerGeneratorDraft02(final DOMSchemaService schemaService, + final DOMMountPointService mountService) { + super(Optional.of(schemaService)); mountPointSwagger = new MountPointSwagger(schemaService, mountService, this); mountPointSwagger.init(); } diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/MountPointSwaggerGeneratorRFC8040.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/MountPointSwaggerGeneratorRFC8040.java index 0eb3427905..8dcca19a44 100644 --- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/MountPointSwaggerGeneratorRFC8040.java +++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/MountPointSwaggerGeneratorRFC8040.java @@ -7,9 +7,8 @@ */ package org.opendaylight.netconf.sal.rest.doc.impl; -import java.util.Objects; import java.util.Optional; -import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; +import org.opendaylight.mdsal.dom.api.DOMMountPointService; import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.netconf.sal.rest.doc.mountpoints.MountPointSwagger; @@ -21,8 +20,9 @@ import org.opendaylight.netconf.sal.rest.doc.mountpoints.MountPointSwagger; public class MountPointSwaggerGeneratorRFC8040 extends BaseYangSwaggerGeneratorRFC8040 implements AutoCloseable { private final MountPointSwagger mountPointSwagger; - public MountPointSwaggerGeneratorRFC8040(DOMSchemaService schemaService, DOMMountPointService mountService) { - super(Optional.of(Objects.requireNonNull(schemaService))); + public MountPointSwaggerGeneratorRFC8040(final DOMSchemaService schemaService, + final DOMMountPointService mountService) { + super(Optional.of(schemaService)); mountPointSwagger = new MountPointSwagger(schemaService, mountService, this); mountPointSwagger.init(); } diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java index df9fca6d25..a29a9a0404 100644 --- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java +++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java @@ -7,21 +7,22 @@ */ package org.opendaylight.netconf.sal.rest.doc.mountpoints; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Objects; +import java.util.Optional; import java.util.TreeMap; import java.util.concurrent.atomic.AtomicLong; import javax.ws.rs.core.UriInfo; -import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint; -import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; +import org.opendaylight.mdsal.dom.api.DOMMountPoint; import org.opendaylight.mdsal.dom.api.DOMMountPointListener; +import org.opendaylight.mdsal.dom.api.DOMMountPointService; import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.netconf.sal.rest.doc.impl.BaseYangSwaggerGenerator; import org.opendaylight.netconf.sal.rest.doc.swagger.Api; @@ -55,9 +56,9 @@ public class MountPointSwagger implements DOMMountPointListener, AutoCloseable { public MountPointSwagger(final DOMSchemaService globalSchema, final DOMMountPointService mountService, final BaseYangSwaggerGenerator swaggerGenerator) { - this.globalSchema = Objects.requireNonNull(globalSchema); - this.mountService = Objects.requireNonNull(mountService); - this.swaggerGenerator = Objects.requireNonNull(swaggerGenerator); + this.globalSchema = requireNonNull(globalSchema); + this.mountService = requireNonNull(mountService); + this.swaggerGenerator = requireNonNull(swaggerGenerator); } public void init() { @@ -129,12 +130,11 @@ public class MountPointSwagger implements DOMMountPointListener, AutoCloseable { } private SchemaContext getSchemaContext(final YangInstanceIdentifier id) { - if (id == null) { return null; } - Preconditions.checkState(mountService != null); + checkState(mountService != null); final Optional mountPoint = this.mountService.getMountPoint(id); if (!mountPoint.isPresent()) { return null; diff --git a/restconf/sal-rest-docgen/src/main/resources/org/opendaylight/blueprint/blueprint.xml b/restconf/sal-rest-docgen/src/main/resources/org/opendaylight/blueprint/blueprint.xml index e9a5ecf1b2..b9eed4ac82 100644 --- a/restconf/sal-rest-docgen/src/main/resources/org/opendaylight/blueprint/blueprint.xml +++ b/restconf/sal-rest-docgen/src/main/resources/org/opendaylight/blueprint/blueprint.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html odl:use-default-for-reference-types="true"> - + diff --git a/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/MountPointSwaggerTest.java b/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/MountPointSwaggerTest.java index 82633e8824..2514e679ee 100644 --- a/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/MountPointSwaggerTest.java +++ b/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/MountPointSwaggerTest.java @@ -12,16 +12,16 @@ import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import com.google.common.base.Optional; import java.util.Arrays; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.TreeSet; import javax.ws.rs.core.UriInfo; import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint; -import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; +import org.opendaylight.mdsal.dom.api.DOMMountPoint; +import org.opendaylight.mdsal.dom.api.DOMMountPointService; import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.netconf.sal.rest.doc.impl.MountPointSwaggerGeneratorDraft02; import org.opendaylight.netconf.sal.rest.doc.mountpoints.MountPointSwagger;