summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
8e29cdd)
This performs a straight-forward migration of sal-rest-docgen.
Change-Id: I18dd4382e16b0716b8551ead1cf15abb9dc14eca
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-core-api</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-dom-api</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
*/
package org.opendaylight.netconf.sal.rest.doc.impl;
*/
package org.opendaylight.netconf.sal.rest.doc.impl;
-import java.util.Objects;
import java.util.Optional;
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;
import org.opendaylight.mdsal.dom.api.DOMSchemaService;
import org.opendaylight.netconf.sal.rest.doc.mountpoints.MountPointSwagger;
private final MountPointSwagger mountPointSwagger;
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();
}
mountPointSwagger = new MountPointSwagger(schemaService, mountService, this);
mountPointSwagger.init();
}
*/
package org.opendaylight.netconf.sal.rest.doc.impl;
*/
package org.opendaylight.netconf.sal.rest.doc.impl;
-import java.util.Objects;
import java.util.Optional;
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;
import org.opendaylight.mdsal.dom.api.DOMSchemaService;
import org.opendaylight.netconf.sal.rest.doc.mountpoints.MountPointSwagger;
public class MountPointSwaggerGeneratorRFC8040 extends BaseYangSwaggerGeneratorRFC8040 implements AutoCloseable {
private final MountPointSwagger 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();
}
mountPointSwagger = new MountPointSwagger(schemaService, mountService, this);
mountPointSwagger.init();
}
*/
package org.opendaylight.netconf.sal.rest.doc.mountpoints;
*/
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.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 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.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;
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;
public MountPointSwagger(final DOMSchemaService globalSchema, final DOMMountPointService mountService,
final BaseYangSwaggerGenerator swaggerGenerator) {
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);
}
private SchemaContext getSchemaContext(final YangInstanceIdentifier id) {
}
private SchemaContext getSchemaContext(final YangInstanceIdentifier id) {
if (id == null) {
return null;
}
if (id == null) {
return null;
}
- Preconditions.checkState(mountService != null);
+ checkState(mountService != null);
final Optional<DOMMountPoint> mountPoint = this.mountService.getMountPoint(id);
if (!mountPoint.isPresent()) {
return null;
final Optional<DOMMountPoint> mountPoint = this.mountService.getMountPoint(id);
if (!mountPoint.isPresent()) {
return null;
odl:use-default-for-reference-types="true">
<reference id="schemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService"/>
odl:use-default-for-reference-types="true">
<reference id="schemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService"/>
- <reference id="domMountPointService" interface="org.opendaylight.controller.md.sal.dom.api.DOMMountPointService"/>
+ <reference id="domMountPointService" interface="org.opendaylight.mdsal.dom.api.DOMMountPointService"/>
<reference id="webServer" interface="org.opendaylight.aaa.web.WebServer"/>
<reference id="webContextSecurer" interface="org.opendaylight.aaa.web.WebContextSecurer"/>
<reference id="servletSupport" interface="org.opendaylight.aaa.web.servlet.ServletSupport" />
<reference id="webServer" interface="org.opendaylight.aaa.web.WebServer"/>
<reference id="webContextSecurer" interface="org.opendaylight.aaa.web.WebContextSecurer"/>
<reference id="servletSupport" interface="org.opendaylight.aaa.web.servlet.ServletSupport" />
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
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.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 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;
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;