X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-docgen%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fdoc%2Fmountpoints%2FMountPointSwagger.java;h=5ed227fd911196f628107682121f168e01c16b06;hb=refs%2Fchanges%2F30%2F16630%2F12;hp=7e8707110fb757e9fae69fb2e02837d34d5b22cf;hpb=2c373d81bbe71d689ef9eb3ee97511a20646aaad;p=controller.git diff --git a/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/mountpoints/MountPointSwagger.java b/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/mountpoints/MountPointSwagger.java index 7e8707110f..5ed227fd91 100644 --- a/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/mountpoints/MountPointSwagger.java +++ b/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/mountpoints/MountPointSwagger.java @@ -7,6 +7,7 @@ */ package org.opendaylight.controller.sal.rest.doc.mountpoints; +import com.google.common.base.Optional; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; @@ -18,9 +19,9 @@ import java.util.TreeMap; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; 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.controller.sal.core.api.model.SchemaService; -import org.opendaylight.controller.sal.core.api.mount.MountProvisionInstance; -import org.opendaylight.controller.sal.core.api.mount.MountProvisionService; import org.opendaylight.controller.sal.core.api.mount.MountProvisionListener; import org.opendaylight.controller.sal.rest.doc.impl.BaseYangSwaggerGenerator; import org.opendaylight.controller.sal.rest.doc.swagger.Api; @@ -40,7 +41,7 @@ public class MountPointSwagger extends BaseYangSwaggerGenerator implements Mount private static final String DATASTORES_REVISION = "-"; private static final String DATASTORES_LABEL = "Datastores"; - private MountProvisionService mountService; + private DOMMountPointService mountService; private final Map instanceIdToLongId = new TreeMap<>( new Comparator() { @Override @@ -150,12 +151,12 @@ public class MountPointSwagger extends BaseYangSwaggerGenerator implements Mount return null; } - MountProvisionInstance mountPoint = mountService.getMountPoint(id); - if (mountPoint == null) { + Optional mountPoint = mountService.getMountPoint(id); + if (!mountPoint.isPresent()) { return null; } - SchemaContext context = mountPoint.getSchemaContext(); + SchemaContext context = mountPoint.get().getSchemaContext(); if (context == null) { return null; } @@ -204,7 +205,7 @@ public class MountPointSwagger extends BaseYangSwaggerGenerator implements Mount return api; } - public void setMountService(final MountProvisionService mountService) { + public void setMountService(final DOMMountPointService mountService) { this.mountService = mountService; }