Clean up revision formatting

[netconf.git] / restconf / sal-rest-connector / src / test / java / org / opendaylight / controller / sal / restconf / impl / test / RestGetOperationTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java
index 1bcfa8fae05d269363f3604bfb8903513ac4c593..43ef9783de09cca5a9b77411686cadd426f4b7c9 100644 (file)
--- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java
+++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java
@@ -18,6 +18,7 @@ import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
@@ -26,7 +27,6 @@ import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
@@ -47,8 +47,6 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
 import org.opendaylight.netconf.sal.rest.impl.JsonNormalizedNodeBodyReader;
@@ -62,6 +60,7 @@ import org.opendaylight.netconf.sal.restconf.impl.ControllerContext;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfImpl;
 import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
@@ -133,7 +132,7 @@ public class RestGetOperationTest extends JerseyTest {
         return resourceConfig;
     }
 
-    private void setControllerContext(final SchemaContext schemaContext) {
+    private static void setControllerContext(final SchemaContext schemaContext) {
         final ControllerContext controllerContext = ControllerContext.getInstance();
         controllerContext.setSchemas(schemaContext);
         restconfImpl.setControllerContext(controllerContext);
@@ -202,7 +201,7 @@ public class RestGetOperationTest extends JerseyTest {
      * @throws ParseException
      */
     @Test
-    public void getDataWithSlashesBehindMountPoint() throws Exception {
+    public void getDataWithSlashesBehindMountPoint() throws ParseException {
         final YangInstanceIdentifier awaitedInstanceIdentifier = prepareInstanceIdentifierForList();
         when(brokerFacade.readConfigurationData(any(DOMMountPoint.class), eq(awaitedInstanceIdentifier),
                 Mockito.anyString())).thenReturn(prepareCnDataForSlashesBehindMountPointTest());
@@ -217,7 +216,7 @@ public class RestGetOperationTest extends JerseyTest {
         assertEquals(200, get(uri, MediaType.APPLICATION_XML));
     }
 
-    private YangInstanceIdentifier prepareInstanceIdentifierForList() throws Exception {
+    private static YangInstanceIdentifier prepareInstanceIdentifierForList() throws ParseException {
         final List<PathArgument> parameters = new ArrayList<>();
 
         final QName qNameCont = newTestModuleQName("cont");
@@ -231,9 +230,9 @@ public class RestGetOperationTest extends JerseyTest {
         return YangInstanceIdentifier.create(parameters);
     }
 
-    private QName newTestModuleQName(final String localPart) throws Exception {
-        final Date revision = new SimpleDateFormat("yyyy-MM-dd").parse("2014-01-09");
-        final URI uri = new URI("test:module");
+    private static QName newTestModuleQName(final String localPart) throws ParseException {
+        final Date revision = SimpleDateFormatUtil.getRevisionFormat().parse("2014-01-09");
+        final URI uri = URI.create("test:module");
         return QName.create(uri, revision, localPart);
     }
 
@@ -374,7 +373,7 @@ public class RestGetOperationTest extends JerseyTest {
 
     }
 
-    private void validateOperationsResponseXml(final Document responseDoc, final SchemaContext schemaContext) {
+    private static void validateOperationsResponseXml(final Document responseDoc, final SchemaContext schemaContext) {
 
         final Element operationsElem = responseDoc.getDocumentElement();
         assertEquals(RESTCONF_NS, operationsElem.getNamespaceURI());
@@ -424,7 +423,8 @@ public class RestGetOperationTest extends JerseyTest {
 
     }
 
-    private Matcher validateOperationsResponseJson(final String searchIn, final String rpcName, final String moduleName) {
+    private static Matcher validateOperationsResponseJson(final String searchIn, final String rpcName,
+            final String moduleName) {
         final StringBuilder regex = new StringBuilder();
         regex.append(".*\"" + rpcName + "\"");
         final Pattern ptrn = Pattern.compile(regex.toString(), Pattern.DOTALL);
@@ -432,7 +432,8 @@ public class RestGetOperationTest extends JerseyTest {
 
     }
 
-    private Matcher validateOperationsResponseXml(final String searchIn, final String rpcName, final String namespace) {
+    private static Matcher validateOperationsResponseXml(final String searchIn, final String rpcName,
+            final String namespace) {
         final StringBuilder regex = new StringBuilder();
 
         regex.append("^");
@@ -527,7 +528,7 @@ public class RestGetOperationTest extends JerseyTest {
 
     }
 
-    private void validateModulesResponseXml(final Response response, final SchemaContext schemaContext) {
+    private static void validateModulesResponseXml(final Response response, final SchemaContext schemaContext) {
         assertEquals(200, response.getStatus());
         final Document responseBody = response.readEntity(Document.class);
         final NodeList moduleNodes = responseBody.getDocumentElement().getElementsByTagNameNS(RESTCONF_NS, "module");
@@ -546,7 +547,7 @@ public class RestGetOperationTest extends JerseyTest {
         assertAllModules(foundModules,schemaContext);
     }
 
-    private void assertAllModules(final Set<QName> foundModules, final SchemaContext schemaContext) {
+    private static void assertAllModules(final Set<QName> foundModules, final SchemaContext schemaContext) {
         for(final Module module : schemaContext.getModules()) {
             final QName current = QName.create(module.getQNameModule(),module.getName());
             assertTrue("Module not found in response.",foundModules.contains(current));
@@ -554,7 +555,7 @@ public class RestGetOperationTest extends JerseyTest {
 
     }
 
-    private QName assertedModuleXmlToModuleQName(final org.w3c.dom.Node module) {
+    private static QName assertedModuleXmlToModuleQName(final org.w3c.dom.Node module) {
         assertEquals("module", module.getLocalName());
         assertEquals(RESTCONF_NS, module.getNamespaceURI());
         String revision = null;
@@ -595,7 +596,7 @@ public class RestGetOperationTest extends JerseyTest {
         return QName.create(namespace,revision,name);
     }
 
-    private void validateModulesResponseJson(final Response response) {
+    private static void validateModulesResponseJson(final Response response) {
         assertEquals(200, response.getStatus());
         final String responseBody = response.readEntity(String.class);
 
@@ -607,7 +608,7 @@ public class RestGetOperationTest extends JerseyTest {
                 .find());
     }
 
-    private Matcher prepareJsonRegex(final String module, final String revision, final String namespace,
+    private static Matcher prepareJsonRegex(final String module, final String revision, final String namespace,
             final String searchIn) {
         final StringBuilder regex = new StringBuilder();
         regex.append("^");
@@ -647,7 +648,8 @@ public class RestGetOperationTest extends JerseyTest {
             }
     */
     @SuppressWarnings("rawtypes")
-    private NormalizedNode prepareCnDataForMountPointTest(final boolean wrapToCont) throws URISyntaxException, ParseException {
+    private static NormalizedNode prepareCnDataForMountPointTest(final boolean wrapToCont)
+            throws URISyntaxException, ParseException {
         final String testModuleDate = "2014-01-09";
         final ContainerNode contChild = Builders
                 .containerBuilder()
@@ -667,18 +669,18 @@ public class RestGetOperationTest extends JerseyTest {
     }
 
     @SuppressWarnings("unchecked")
-    private void mockReadOperationalDataMethod() {
+    private static void mockReadOperationalDataMethod() {
         when(brokerFacade.readOperationalData(any(YangInstanceIdentifier.class))).thenReturn(answerFromGet);
     }
 
     @SuppressWarnings("unchecked")
-    private void mockReadConfigurationDataMethod() {
+    private static void mockReadConfigurationDataMethod() {
         when(brokerFacade.readConfigurationData(any(YangInstanceIdentifier.class), Mockito.anyString()))
                 .thenReturn(answerFromGet);
     }
 
     @SuppressWarnings("rawtypes")
-    private NormalizedNode prepareCnDataForSlashesBehindMountPointTest() throws ParseException {
+    private static NormalizedNode prepareCnDataForSlashesBehindMountPointTest() throws ParseException {
         return ImmutableMapEntryNodeBuilder
                 .create()
                 .withNodeIdentifier(
@@ -735,12 +737,7 @@ public class RestGetOperationTest extends JerseyTest {
         final MultivaluedMap<String, String> paramMap = new MultivaluedHashMap<>();
         paramMap.putSingle("depth", "1o");
         final UriInfo mockInfo = mock(UriInfo.class);
-        when(mockInfo.getQueryParameters(false)).thenAnswer(new Answer<MultivaluedMap<String, String>>() {
-            @Override
-            public MultivaluedMap<String, String> answer(final InvocationOnMock invocation) {
-                return paramMap;
-            }
-        });
+        when(mockInfo.getQueryParameters(false)).thenAnswer(invocation -> paramMap);
 
         getDataWithInvalidDepthParameterTest(mockInfo);
 
@@ -752,7 +749,7 @@ public class RestGetOperationTest extends JerseyTest {
     }
 
     @SuppressWarnings({"rawtypes", "unchecked"})
-    private void getDataWithInvalidDepthParameterTest(final UriInfo uriInfo) {
+    private static void getDataWithInvalidDepthParameterTest(final UriInfo uriInfo) {
         try {
             final QName qNameDepth1Cont = QName.create("urn:nested:module", "2014-06-3", "depth1-cont");
             final YangInstanceIdentifier ii = YangInstanceIdentifier.builder().node(qNameDepth1Cont).build();