X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Fsal-rest-docgen%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fdoc%2Fimpl%2FDocGenTestHelper.java;h=1c48480a830070f0aac00c49fc30dfb4db1053f0;hb=45cfee1861924b4a8086d38079ce8cbd320386d6;hp=3adc8569837f3638c5a97cb422899d44d6000daa;hpb=7b1674ad35be31bba6a83c116677e0dee197cb92;p=netconf.git

diff --git a/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/DocGenTestHelper.java b/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/DocGenTestHelper.java
index 3adc856983..1c48480a83 100644
--- a/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/DocGenTestHelper.java
+++ b/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/DocGenTestHelper.java
@@ -12,7 +12,6 @@ import static org.mockito.Mockito.when;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.net.URI;
@@ -20,18 +19,15 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 import org.mockito.ArgumentCaptor;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class DocGenTestHelper {
@@ -40,8 +36,7 @@ public class DocGenTestHelper {
     private ObjectMapper mapper;
     private SchemaContext schemaContext;
 
-    public Set<Module> loadModules(final String resourceDirectory)
-            throws URISyntaxException, FileNotFoundException, ReactorException {
+    public Set<Module> loadModules(final String resourceDirectory) throws URISyntaxException, FileNotFoundException {
 
         final URI resourceDirUri = getClass().getResource(resourceDirectory).toURI();
         final File testDir = new File(resourceDirUri);
@@ -54,7 +49,7 @@ public class DocGenTestHelper {
             files.add(new File(testDir, fileName));
         }
 
-        this.schemaContext = YangParserTestUtils.parseYangSources(files);
+        this.schemaContext = YangParserTestUtils.parseYangFiles(files);
         return this.schemaContext.getModules();
     }
 
@@ -65,7 +60,6 @@ public class DocGenTestHelper {
     public void setUp() throws Exception {
         this.modules = loadModules("/yang");
         this.mapper = new ObjectMapper();
-        this.mapper.registerModule(new JsonOrgModule());
         this.mapper.configure(SerializationFeature.INDENT_OUTPUT, true);
     }
 
@@ -92,36 +86,30 @@ public class DocGenTestHelper {
         when(mockContext.getModules()).thenReturn(this.modules);
 
         final ArgumentCaptor<String> moduleCapture = ArgumentCaptor.forClass(String.class);
-        final ArgumentCaptor<Date> dateCapture = ArgumentCaptor.forClass(Date.class);
+        final ArgumentCaptor<Optional> dateCapture = ArgumentCaptor.forClass(Optional.class);
         final ArgumentCaptor<URI> namespaceCapture = ArgumentCaptor.forClass(URI.class);
-        when(mockContext.findModuleByName(moduleCapture.capture(), dateCapture.capture())).then(
-                new Answer<Module>() {
-                    @Override
-                    public Module answer(final InvocationOnMock invocation) throws Throwable {
-                        final String module = moduleCapture.getValue();
-                        final Date date = dateCapture.getValue();
-                        for (final Module m : Collections.unmodifiableSet(DocGenTestHelper.this.modules)) {
-                            if (m.getName().equals(module) && m.getRevision().equals(date)) {
-                                return m;
-                            }
-                        }
-                        return null;
+        when(mockContext.findModule(moduleCapture.capture(), dateCapture.capture())).then(
+            invocation -> {
+                final String module = moduleCapture.getValue();
+                final Optional<?> date = dateCapture.getValue();
+                for (final Module m : Collections.unmodifiableSet(DocGenTestHelper.this.modules)) {
+                    if (m.getName().equals(module) && m.getRevision().equals(date)) {
+                        return Optional.of(m);
                     }
-                });
-        when(mockContext.findModuleByNamespaceAndRevision(namespaceCapture.capture(), dateCapture.capture())).then(
-                new Answer<Module>() {
-                    @Override
-                    public Module answer(final InvocationOnMock invocation) throws Throwable {
-                        final URI namespace = namespaceCapture.getValue();
-                        final Date date = dateCapture.getValue();
-                        for (final Module m : Collections.unmodifiableSet(DocGenTestHelper.this.modules)) {
-                            if (m.getNamespace().equals(namespace) && m.getRevision().equals(date)) {
-                                return m;
-                            }
-                        }
-                        return null;
+                }
+                return Optional.empty();
+            });
+        when(mockContext.findModule(namespaceCapture.capture(), dateCapture.capture())).then(
+            invocation -> {
+                final URI namespace = namespaceCapture.getValue();
+                final Optional<?> date = dateCapture.getValue();
+                for (final Module m : Collections.unmodifiableSet(DocGenTestHelper.this.modules)) {
+                    if (m.getNamespace().equals(namespace) && m.getRevision().equals(date)) {
+                        return Optional.of(m);
                     }
-                });
+                }
+                return Optional.empty();
+            });
         return mockContext;
     }
 
@@ -132,12 +120,7 @@ public class DocGenTestHelper {
 
         final ArgumentCaptor<String> subStringCapture = ArgumentCaptor.forClass(String.class);
         when(mockBuilder.path(subStringCapture.capture())).thenReturn(mockBuilder);
-        when(mockBuilder.build()).then(new Answer<URI>() {
-            @Override
-            public URI answer(final InvocationOnMock invocation) throws Throwable {
-                return URI.create(uri + "/" + subStringCapture.getValue());
-            }
-        });
+        when(mockBuilder.build()).then(invocation -> URI.create(uri + "/" + subStringCapture.getValue()));
 
         final UriInfo info = mock(UriInfo.class);