Bug 5528 - Preparing enviroment for impl of restful services

  * repackeging
  * fixing changes

Change-Id: I2ece0416ed09c3fc3517957427e18673406013de
Signed-off-by: Jakub Toth <jatoth@cisco.com>

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/RestconfWrapperProviders.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/RestconfWrapperProviders.java
index 33b826b86e0f0c1b0ef442e9ab51599a51dbea90..df1ea9a1272ca0f1a9e7353633792e94ba132aee 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/RestconfWrapperProviders.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/RestconfWrapperProviders.java
@@ -12,7 +12,7 @@ import org.opendaylight.controller.config.yang.md.sal.rest.connector.RestConnect
 import org.opendaylight.controller.sal.core.api.Broker;
 import org.opendaylight.netconf.sal.rest.api.RestConnector;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfProviderImpl;
-import org.opendaylight.restconf.rest.RestConnectorProvider;
+import org.opendaylight.restconf.RestConnectorProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
 
 /**

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalService.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalService.java
index 52999a5cd2019ed580d3a9dce9315b0b132cbaec..2dc16e209b1ab6b632db052644d20d34de403859 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalService.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalService.java
@@ -12,7 +12,7 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
-import org.opendaylight.restconf.rest.api.services.schema.RestconfSchemaService;
+import org.opendaylight.restconf.rest.services.api.RestconfSchemaService;
 
 /**
  * @deprecated do not use this api. It is replaced by

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfService.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfService.java
index 1c99af58babc20d5f044dcc320111daa85e7d5bd..ade5a41d5878729fa9a238ec1989aeb0fed81de7 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfService.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfService.java
@@ -26,9 +26,9 @@ import org.opendaylight.netconf.sal.rest.impl.PATCH;
 import org.opendaylight.netconf.sal.restconf.impl.NormalizedNodeContext;
 import org.opendaylight.netconf.sal.restconf.impl.PATCHContext;
 import org.opendaylight.netconf.sal.restconf.impl.PATCHStatusContext;
-import org.opendaylight.restconf.rest.api.services.RestconfModulesService;
-import org.opendaylight.restconf.rest.api.services.RestconfOperationsService;
-import org.opendaylight.restconf.rest.api.services.RestconfStreamsService;
+import org.opendaylight.restconf.rest.services.api.RestconfModulesService;
+import org.opendaylight.restconf.rest.services.api.RestconfOperationsService;
+import org.opendaylight.restconf.rest.services.api.RestconfStreamsService;
 import org.opendaylight.restconf.restful.services.api.RestconfDataService;
 import org.opendaylight.restconf.restful.services.api.RestconfInvokeOperationsService;
 

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/RestConnectorProvider.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/RestConnectorProvider.java
similarity index 89%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/RestConnectorProvider.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/RestConnectorProvider.java
index 8dafecbf143f433461cc4c3546530eaf9331f213..ce6b2d2ecb5cf9155b0bf628ed8566127992ed5b 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/RestConnectorProvider.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/RestConnectorProvider.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest;
+package org.opendaylight.restconf;
 
 import com.google.common.base.Preconditions;
 import java.util.Collection;
@@ -15,11 +15,11 @@ import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
 import org.opendaylight.controller.sal.core.api.Provider;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.netconf.sal.rest.api.RestConnector;
-import org.opendaylight.restconf.rest.api.schema.context.SchemaContextHandler;
+import org.opendaylight.restconf.common.handlers.api.SchemaContextHandler;
+import org.opendaylight.restconf.common.handlers.impl.SchemaContextHandlerImpl;
 import org.opendaylight.restconf.rest.handlers.api.DOMMountPointServiceHandler;
 import org.opendaylight.restconf.rest.handlers.impl.DOMMountPointServiceHandlerImpl;
-import org.opendaylight.restconf.rest.impl.schema.context.SchemaContextHandlerImpl;
-import org.opendaylight.restconf.rest.impl.services.Draft11ServicesWrapperImpl;
+import org.opendaylight.restconf.rest.services.impl.Draft11ServicesWrapperImpl;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
 

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/RestconfApplication.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/RestconfApplication.java
similarity index 93%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/RestconfApplication.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/RestconfApplication.java
index ae778993d5937c82301460b24f3d7cf5a21a5c93..44770388d4b2ba04fb104f8a3bad7c988ca21b4d 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/RestconfApplication.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/RestconfApplication.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest;
+package org.opendaylight.restconf;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.HashSet;
@@ -15,7 +15,7 @@ import org.opendaylight.netconf.md.sal.rest.schema.SchemaExportContentYangBodyWr
 import org.opendaylight.netconf.md.sal.rest.schema.SchemaExportContentYinBodyWriter;
 import org.opendaylight.netconf.sal.rest.impl.NormalizedNodeJsonBodyWriter;
 import org.opendaylight.netconf.sal.rest.impl.NormalizedNodeXmlBodyWriter;
-import org.opendaylight.restconf.rest.impl.services.Draft11ServicesWrapperImpl;
+import org.opendaylight.restconf.rest.services.impl.Draft11ServicesWrapperImpl;
 
 public class RestconfApplication extends Application {
 

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/schema/context/SchemaContextHandler.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/handlers/api/SchemaContextHandler.java
similarity index 92%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/schema/context/SchemaContextHandler.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/handlers/api/SchemaContextHandler.java
index e4ebdc4235af58da86eff7fe1f1a4e3a05c6dd21..db45a78c585c1223f1c14616c77c9d73fdbdb13c 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/schema/context/SchemaContextHandler.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/handlers/api/SchemaContextHandler.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.api.schema.context;
+package org.opendaylight.restconf.common.handlers.api;
 
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/schema/context/SchemaContextHandlerImpl.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/handlers/impl/SchemaContextHandlerImpl.java
similarity index 85%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/schema/context/SchemaContextHandlerImpl.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/handlers/impl/SchemaContextHandlerImpl.java
index b2ac93eae05810fa088ca1a09211801e42b9eb09..01533425a0eff8f4419d0ffec23b10bb20476021 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/schema/context/SchemaContextHandlerImpl.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/handlers/impl/SchemaContextHandlerImpl.java
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.impl.schema.context;
+package org.opendaylight.restconf.common.handlers.impl;
 
-import org.opendaylight.restconf.rest.api.schema.context.SchemaContextHandler;
+import org.opendaylight.restconf.common.handlers.api.SchemaContextHandler;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 /**

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/SchemaContextRef.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/references/SchemaContextRef.java
similarity index 96%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/SchemaContextRef.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/references/SchemaContextRef.java
index a934a69a7df069b11d60530561834b7245c2b244..c15ffa3865e63d47b3a6e1adf7f6495002d519e2 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/SchemaContextRef.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/references/SchemaContextRef.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.impl.services;
+package org.opendaylight.restconf.common.references;
 
 import java.lang.ref.SoftReference;
 import java.net.URI;
@@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
  * {@link SchemaContext}.
  *
  */
-final class SchemaContextRef {
+public final class SchemaContextRef {
 
     private final SoftReference<SchemaContext> schemaContextRef;
 
@@ -73,7 +73,7 @@ final class SchemaContextRef {
 
     /**
      * Get {@link Module} by ietf-restconf qname from
-     * {@link Draft09.RestconfModule}
+     * {@link Draft11.RestconfModule}
      *
      * @return {@link Module}
      */
@@ -103,7 +103,7 @@ final class SchemaContextRef {
      *
      * @param mountPoint
      *            - mount point
-     * @param qname
+     * @param moduleQname
      *            - {@link QName} of module
      * @return {@link Module}
      */

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/Draft11ServicesWrapper.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/Draft11ServicesWrapper.java
similarity index 84%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/Draft11ServicesWrapper.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/Draft11ServicesWrapper.java
index 24dcd0bc66f7372314886f233037416ada903c0c..a1e6485d80786795533ffe4d53808454e2eaf4f5 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/Draft11ServicesWrapper.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/Draft11ServicesWrapper.java
@@ -5,10 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.api.services;
+package org.opendaylight.restconf.rest.services.api;
 
 import javax.ws.rs.Path;
-import org.opendaylight.restconf.rest.api.services.schema.RestconfSchemaService;
 
 /**
  * Wrapper for all services:

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/RestconfModulesService.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfModulesService.java
similarity index 98%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/RestconfModulesService.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfModulesService.java
index b671c325bf1c6bb568e383fc9438855970f783c3..efc41ab2d9b0e0c4eb2df82279ff84931a9904a5 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/RestconfModulesService.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfModulesService.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.api.services;
+package org.opendaylight.restconf.rest.services.api;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/RestconfOperationsService.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfOperationsService.java
similarity index 97%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/RestconfOperationsService.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfOperationsService.java
index a7d66c9876db028cb6e2475ef9d93783e1b33959..b6c065dfa63c4b48208f5def4d5dc3823b20083c 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/RestconfOperationsService.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfOperationsService.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.api.services;
+package org.opendaylight.restconf.rest.services.api;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/schema/RestconfSchemaService.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfSchemaService.java
similarity index 94%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/schema/RestconfSchemaService.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfSchemaService.java
index 2e0d6f9c72be8d662ec2da1d4459867c8d0f1263..f23411e04d770f666bdc600c93eff9bfa26b1f1c 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/schema/RestconfSchemaService.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfSchemaService.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.api.services.schema;
+package org.opendaylight.restconf.rest.services.api;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/RestconfStreamsService.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfStreamsService.java
similarity index 96%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/RestconfStreamsService.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfStreamsService.java
index 3d48e0cb48d8e628a6a2b74aca15ce41bd9dc0f1..268d420b9af487809ec3db49139dd3309b10e757 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/api/services/RestconfStreamsService.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfStreamsService.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.api.services;
+package org.opendaylight.restconf.rest.services.api;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/Draft11ServicesWrapperImpl.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/Draft11ServicesWrapperImpl.java
similarity index 86%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/Draft11ServicesWrapperImpl.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/Draft11ServicesWrapperImpl.java
index 05991cb97e5073c793bc7592da5224c9d6354139..dba808b66aac526dd80fd8420329f70a7ac671ed 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/Draft11ServicesWrapperImpl.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/Draft11ServicesWrapperImpl.java
@@ -5,18 +5,18 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.impl.services;
+package org.opendaylight.restconf.rest.services.impl;
 
 import javax.ws.rs.core.UriInfo;
 import org.opendaylight.netconf.md.sal.rest.schema.SchemaExportContext;
 import org.opendaylight.netconf.sal.restconf.impl.NormalizedNodeContext;
-import org.opendaylight.restconf.rest.api.schema.context.SchemaContextHandler;
-import org.opendaylight.restconf.rest.api.services.Draft11ServicesWrapper;
-import org.opendaylight.restconf.rest.api.services.RestconfModulesService;
-import org.opendaylight.restconf.rest.api.services.RestconfOperationsService;
-import org.opendaylight.restconf.rest.api.services.RestconfStreamsService;
-import org.opendaylight.restconf.rest.api.services.schema.RestconfSchemaService;
+import org.opendaylight.restconf.common.handlers.api.SchemaContextHandler;
 import org.opendaylight.restconf.rest.handlers.api.DOMMountPointServiceHandler;
+import org.opendaylight.restconf.rest.services.api.Draft11ServicesWrapper;
+import org.opendaylight.restconf.rest.services.api.RestconfModulesService;
+import org.opendaylight.restconf.rest.services.api.RestconfOperationsService;
+import org.opendaylight.restconf.rest.services.api.RestconfSchemaService;
+import org.opendaylight.restconf.rest.services.api.RestconfStreamsService;
 
 /**
  * Implementation of {@link Draft11ServicesWrapper}

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/RestconfModulesServiceImpl.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfModulesServiceImpl.java
similarity index 97%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/RestconfModulesServiceImpl.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfModulesServiceImpl.java
index 58b4fee263654ab5c6cb7874548c15037c4f585b..c5261958533b1ae7e2e54a1ceceab5996d665cff 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/RestconfModulesServiceImpl.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfModulesServiceImpl.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.impl.services;
+package org.opendaylight.restconf.rest.services.impl;
 
 import com.google.common.base.Preconditions;
 import java.util.Collections;
@@ -19,9 +19,10 @@ import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfError.ErrorTag;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfError.ErrorType;
 import org.opendaylight.restconf.Draft11;
-import org.opendaylight.restconf.rest.api.schema.context.SchemaContextHandler;
-import org.opendaylight.restconf.rest.api.services.RestconfModulesService;
+import org.opendaylight.restconf.common.handlers.api.SchemaContextHandler;
+import org.opendaylight.restconf.common.references.SchemaContextRef;
 import org.opendaylight.restconf.rest.handlers.api.DOMMountPointServiceHandler;
+import org.opendaylight.restconf.rest.services.api.RestconfModulesService;
 import org.opendaylight.restconf.utils.RestconfConstants;
 import org.opendaylight.restconf.utils.mapping.RestconfMappingNodeUtil;
 import org.opendaylight.restconf.utils.parser.ParserIdentifier;

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/RestconfOperationsServiceImpl.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfOperationsServiceImpl.java
similarity index 90%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/RestconfOperationsServiceImpl.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfOperationsServiceImpl.java
index 972ef9a84247b0386dbb25f6fc3f3ee5360a5fbc..f269e9a0cb246855046bae0936e420541af679b0 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/RestconfOperationsServiceImpl.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfOperationsServiceImpl.java
@@ -5,14 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.impl.services;
+package org.opendaylight.restconf.rest.services.impl;
 
 import javax.ws.rs.core.UriInfo;
 import org.opendaylight.netconf.sal.restconf.impl.NormalizedNodeContext;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException;
-import org.opendaylight.restconf.rest.api.schema.context.SchemaContextHandler;
-import org.opendaylight.restconf.rest.api.services.RestconfOperationsService;
+import org.opendaylight.restconf.common.handlers.api.SchemaContextHandler;
 import org.opendaylight.restconf.rest.handlers.api.DOMMountPointServiceHandler;
+import org.opendaylight.restconf.rest.services.api.RestconfOperationsService;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 /**

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/RestconfSchemaServiceImpl.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfSchemaServiceImpl.java
similarity index 87%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/RestconfSchemaServiceImpl.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfSchemaServiceImpl.java
index 2962eff050cc1f7b3aa7b3f588271f5146cf5daf..f5682d7b777e3266b2d5a278fce587825fd11c75 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/RestconfSchemaServiceImpl.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfSchemaServiceImpl.java
@@ -5,12 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.impl.services;
+package org.opendaylight.restconf.rest.services.impl;
 
 import org.opendaylight.netconf.md.sal.rest.schema.SchemaExportContext;
-import org.opendaylight.restconf.rest.api.schema.context.SchemaContextHandler;
-import org.opendaylight.restconf.rest.api.services.schema.RestconfSchemaService;
+import org.opendaylight.restconf.common.handlers.api.SchemaContextHandler;
+import org.opendaylight.restconf.common.references.SchemaContextRef;
 import org.opendaylight.restconf.rest.handlers.api.DOMMountPointServiceHandler;
+import org.opendaylight.restconf.rest.services.api.RestconfSchemaService;
 import org.opendaylight.restconf.utils.parser.ParserIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/RestconfStreamsServiceImpl.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfStreamsServiceImpl.java
similarity index 93%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/RestconfStreamsServiceImpl.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfStreamsServiceImpl.java
index 1b6365285a5976a4335b6d36f3386cab6d88df6a..1fb85aae8ca4972513d58a3c8aee605742bfc28b 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/impl/services/RestconfStreamsServiceImpl.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfStreamsServiceImpl.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.impl.services;
+package org.opendaylight.restconf.rest.services.impl;
 
 import com.google.common.base.Preconditions;
 import java.util.Set;
@@ -14,8 +14,9 @@ import org.opendaylight.netconf.sal.restconf.impl.InstanceIdentifierContext;
 import org.opendaylight.netconf.sal.restconf.impl.NormalizedNodeContext;
 import org.opendaylight.netconf.sal.streams.listeners.Notificator;
 import org.opendaylight.restconf.Draft11;
-import org.opendaylight.restconf.rest.api.schema.context.SchemaContextHandler;
-import org.opendaylight.restconf.rest.api.services.RestconfStreamsService;
+import org.opendaylight.restconf.common.handlers.api.SchemaContextHandler;
+import org.opendaylight.restconf.common.references.SchemaContextRef;
+import org.opendaylight.restconf.rest.services.api.RestconfStreamsService;
 import org.opendaylight.restconf.utils.mapping.RestconfMappingNodeUtil;
 import org.opendaylight.restconf.utils.schema.context.RestconfSchemaUtil;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;

diff --git a/restconf/sal-rest-connector/src/main/resources/WEB-INF/web.xml b/restconf/sal-rest-connector/src/main/resources/WEB-INF/web.xml
index aa28819565e60df95b8daef87996d5bbb7274674..bdb149f14f8074143533ec63033869b8c7880742 100644 (file)
--- a/restconf/sal-rest-connector/src/main/resources/WEB-INF/web.xml
+++ b/restconf/sal-rest-connector/src/main/resources/WEB-INF/web.xml
@@ -4,21 +4,21 @@
     version="3.0">
 
     <servlet>
-        <servlet-name>Restconf</servlet-name>
+        <servlet-name>JAXRSRestconf</servlet-name>
         <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
-            <param-value>org.opendaylight.restconf.rest.RestconfApplication</param-value>
+            <param-value>org.opendaylight.netconf.sal.rest.impl.RestconfApplication</param-value>
         </init-param>
         <load-on-startup>0</load-on-startup>
     </servlet>
 
     <servlet>
-        <servlet-name>JAXRSRestconf</servlet-name>
+        <servlet-name>Restconf</servlet-name>
         <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
-            <param-value>org.opendaylight.netconf.sal.rest.impl.RestconfApplication</param-value>
+            <param-value>org.opendaylight.restconf.RestconfApplication</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/RestConnectorProviderTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/RestConnectorProviderTest.java
index b50450cd8418e52bff18f076dec90205580f32b4..d2ce0adefa489c170cdd06af56e44d94a6f794ed 100644 (file)
--- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/RestConnectorProviderTest.java
+++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/RestConnectorProviderTest.java
@@ -12,7 +12,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -23,7 +22,8 @@ import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
 import org.opendaylight.controller.sal.core.api.Broker;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
-import org.opendaylight.restconf.rest.api.schema.context.SchemaContextHandler;
+import org.opendaylight.restconf.RestConnectorProvider;
+import org.opendaylight.restconf.common.handlers.api.SchemaContextHandler;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
 
@@ -45,7 +45,7 @@ public class RestConnectorProviderTest {
     @Before
     public void init() {
         MockitoAnnotations.initMocks(this);
-        connectorProvider = new RestConnectorProvider();
+        this.connectorProvider = new RestConnectorProvider();
     }
 
     /**
@@ -53,7 +53,7 @@ public class RestConnectorProviderTest {
      */
     @Test
     public void restConnectorProviderInitTest() {
-        assertNotNull("Connector provider should be initialized and not null", connectorProvider);
+        assertNotNull("Connector provider should be initialized and not null", this.connectorProvider);
     }
 
     /**
@@ -66,16 +66,16 @@ public class RestConnectorProviderTest {
     @Test
     public void successfulRegistrationTest() {
         // prepare conditions
-        when(mockSession.getService(SchemaService.class)).thenReturn(mockSchemaService);
-        when(mockSession.getService(DOMMountPointService.class)).thenReturn(mockMountPointService);
+        when(this.mockSession.getService(SchemaService.class)).thenReturn(this.mockSchemaService);
+        when(this.mockSession.getService(DOMMountPointService.class)).thenReturn(this.mockMountPointService);
 
         // test
-        connectorProvider.onSessionInitiated(mockSession);
+        this.connectorProvider.onSessionInitiated(this.mockSession);
 
         // verify interactions
-        verify(mockSession, times(1)).getService(SchemaService.class);
-        verify(mockSession, times(1)).getService(DOMMountPointService.class);
-        verify(mockSchemaService, times(1)).registerSchemaContextListener(Mockito.any(SchemaContextHandler.class));
+        verify(this.mockSession, times(1)).getService(SchemaService.class);
+        verify(this.mockSession, times(1)).getService(DOMMountPointService.class);
+        verify(this.mockSchemaService, times(1)).registerSchemaContextListener(Mockito.any(SchemaContextHandler.class));
     }
 
     /**
@@ -88,16 +88,16 @@ public class RestConnectorProviderTest {
     @Test
     public void successfulRegistrationWithoutMountPointTest() {
         // prepare conditions
-        when(mockSession.getService(SchemaService.class)).thenReturn(mockSchemaService);
-        when(mockSession.getService(DOMMountPointService.class)).thenReturn(null);
+        when(this.mockSession.getService(SchemaService.class)).thenReturn(this.mockSchemaService);
+        when(this.mockSession.getService(DOMMountPointService.class)).thenReturn(null);
 
         // test
-        connectorProvider.onSessionInitiated(mockSession);
+        this.connectorProvider.onSessionInitiated(this.mockSession);
 
         // verify interactions
-        verify(mockSession, times(1)).getService(SchemaService.class);
-        verify(mockSession, times(1)).getService(DOMMountPointService.class);
-        verify(mockSchemaService, times(1)).registerSchemaContextListener(Mockito.any(SchemaContextHandler.class));
+        verify(this.mockSession, times(1)).getService(SchemaService.class);
+        verify(this.mockSession, times(1)).getService(DOMMountPointService.class);
+        verify(this.mockSchemaService, times(1)).registerSchemaContextListener(Mockito.any(SchemaContextHandler.class));
     }
 
     /**
@@ -106,8 +106,8 @@ public class RestConnectorProviderTest {
      */
     @Test
     public void nullSessionRegistrationNegativeTest() {
-        thrown.expect(NullPointerException.class);
-        connectorProvider.onSessionInitiated(null);
+        this.thrown.expect(NullPointerException.class);
+        this.connectorProvider.onSessionInitiated(null);
     }
 
     /**
@@ -118,14 +118,14 @@ public class RestConnectorProviderTest {
     @Test
     public void withoutSchemaServiceRegistrationNegativeTest() {
         // prepare conditions
-        when(mockSession.getService(SchemaService.class)).thenReturn(null);
+        when(this.mockSession.getService(SchemaService.class)).thenReturn(null);
 
         // test
-        thrown.expect(NullPointerException.class);
-        connectorProvider.onSessionInitiated(mockSession);
+        this.thrown.expect(NullPointerException.class);
+        this.connectorProvider.onSessionInitiated(this.mockSession);
 
         // verify interaction
-        verify(mockSession, times(1)).getService(SchemaService.class);
+        verify(this.mockSession, times(1)).getService(SchemaService.class);
     }
 
     /**
@@ -133,7 +133,7 @@ public class RestConnectorProviderTest {
      */
     @Test
     public void closeNotOpenTest() throws Exception {
-        connectorProvider.close();
+        this.connectorProvider.close();
     }
 
     /**
@@ -142,18 +142,18 @@ public class RestConnectorProviderTest {
     @Test
     public void closeOpenTest() throws Exception {
         // prepare conditions
-        when(mockSession.getService(SchemaService.class)).thenReturn(mockSchemaService);
-        when(mockSession.getService(DOMMountPointService.class)).thenReturn(mockMountPointService);
-        when(mockSchemaService.registerSchemaContextListener(Mockito.any(SchemaContextHandler.class)))
-                .thenReturn(mockRegistration);
+        when(this.mockSession.getService(SchemaService.class)).thenReturn(this.mockSchemaService);
+        when(this.mockSession.getService(DOMMountPointService.class)).thenReturn(this.mockMountPointService);
+        when(this.mockSchemaService.registerSchemaContextListener(Mockito.any(SchemaContextHandler.class)))
+                .thenReturn(this.mockRegistration);
 
         // register
-        connectorProvider.onSessionInitiated(mockSession);
+        this.connectorProvider.onSessionInitiated(this.mockSession);
 
         // close registration
-        connectorProvider.close();
+        this.connectorProvider.close();
 
         // verify interaction
-        verify(mockRegistration, times(1)).close();
+        verify(this.mockRegistration, times(1)).close();
     }
 }

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/impl/schema/context/SchemaContextHandlerTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/impl/schema/context/SchemaContextHandlerTest.java
index d69305f7af9157fbfcba744555f66624ec1e327c..78d84abd8e0bf356bc2e4e75ac250f664dd037aa 100644 (file)
--- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/impl/schema/context/SchemaContextHandlerTest.java
+++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/impl/schema/context/SchemaContextHandlerTest.java
@@ -10,15 +10,12 @@ package org.opendaylight.restconf.rest.impl.schema.context;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
-
-import java.io.FileNotFoundException;
-import java.net.URISyntaxException;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.rest.common.TestRestconfUtils;
-import org.opendaylight.restconf.rest.api.schema.context.SchemaContextHandler;
+import org.opendaylight.restconf.common.handlers.api.SchemaContextHandler;
+import org.opendaylight.restconf.common.handlers.impl.SchemaContextHandlerImpl;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
 /**
  * Tests for handling {@link SchemaContext}
@@ -33,10 +30,10 @@ public class SchemaContextHandlerTest {
 
     @Before
     public void setup() throws Exception {
-        schemaContextHandler = new SchemaContextHandlerImpl();
+        this.schemaContextHandler = new SchemaContextHandlerImpl();
 
-        schemaContext = TestRestconfUtils.loadSchemaContext(PATH_FOR_ACTUAL_SCHEMA_CONTEXT);
-        schemaContextHandler.onGlobalContextUpdated(schemaContext);
+        this.schemaContext = TestRestconfUtils.loadSchemaContext(PATH_FOR_ACTUAL_SCHEMA_CONTEXT);
+        this.schemaContextHandler.onGlobalContextUpdated(this.schemaContext);
     }
 
     /**
@@ -44,7 +41,7 @@ public class SchemaContextHandlerTest {
      */
     @Test
     public void schemaContextHandlerImplInitTest() {
-        assertNotNull("Handler should be created and not null", schemaContextHandler);
+        assertNotNull("Handler should be created and not null", this.schemaContextHandler);
     }
 
     /**
@@ -56,7 +53,7 @@ public class SchemaContextHandlerTest {
     @Test
     public void getSchemaContextTest() {
         assertEquals("SchemaContextHandler should has reference to actual SchemaContext",
-                schemaContext, schemaContextHandler.getSchemaContext());
+                this.schemaContext, this.schemaContextHandler.getSchemaContext());
     }
 
     /**
@@ -68,12 +65,12 @@ public class SchemaContextHandlerTest {
     @Test
     public void onGlobalContextUpdateTest() throws Exception {
         // create new SchemaContext and update SchemaContextHandler
-        SchemaContext newSchemaContext = TestRestconfUtils.loadSchemaContext(PATH_FOR_NEW_SCHEMA_CONTEXT);
-        schemaContextHandler.onGlobalContextUpdated(newSchemaContext);
+        final SchemaContext newSchemaContext = TestRestconfUtils.loadSchemaContext(PATH_FOR_NEW_SCHEMA_CONTEXT);
+        this.schemaContextHandler.onGlobalContextUpdated(newSchemaContext);
 
         assertNotEquals("SchemaContextHandler should not has reference to old SchemaContext",
-                schemaContext, schemaContextHandler.getSchemaContext());
+                this.schemaContext, this.schemaContextHandler.getSchemaContext());
         assertEquals("SchemaContextHandler should has reference to new SchemaContext",
-                newSchemaContext, schemaContextHandler.getSchemaContext());
+                newSchemaContext, this.schemaContextHandler.getSchemaContext());
     }
 }

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/impl/services/RestconfSchemaServiceTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/impl/services/RestconfSchemaServiceTest.java
index c3460ad298d8cf92937160c4133ded40c587f978..2ffb5a0ff41bb716959f7bebe5c712d6baeb67f4 100644 (file)
--- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/impl/services/RestconfSchemaServiceTest.java
+++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/impl/services/RestconfSchemaServiceTest.java
@@ -13,7 +13,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.when;
-
 import com.google.common.collect.ImmutableClassToInstanceMap;
 import java.util.HashMap;
 import org.junit.Before;
@@ -30,9 +29,10 @@ import org.opendaylight.controller.md.sal.rest.common.TestRestconfUtils;
 import org.opendaylight.netconf.md.sal.rest.schema.SchemaExportContext;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfError;
-import org.opendaylight.restconf.rest.api.schema.context.SchemaContextHandler;
-import org.opendaylight.restconf.rest.api.services.schema.RestconfSchemaService;
+import org.opendaylight.restconf.common.handlers.api.SchemaContextHandler;
 import org.opendaylight.restconf.rest.handlers.api.DOMMountPointServiceHandler;
+import org.opendaylight.restconf.rest.services.api.RestconfSchemaService;
+import org.opendaylight.restconf.rest.services.impl.RestconfSchemaServiceImpl;
 import org.opendaylight.restconf.utils.RestconfConstants;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
@@ -79,29 +79,29 @@ public class RestconfSchemaServiceTest {
     public void setup() throws Exception {
         MockitoAnnotations.initMocks(this);
 
-        schemaContext = TestRestconfUtils.loadSchemaContext("/modules");
-        schemaContextBehindMountPoint = TestRestconfUtils.loadSchemaContext("/modules/modules-behind-mount-point");
-        schemaContextWithMountPoints = TestRestconfUtils.loadSchemaContext("/modules/mount-points");
+        this.schemaContext = TestRestconfUtils.loadSchemaContext("/modules");
+        this.schemaContextBehindMountPoint = TestRestconfUtils.loadSchemaContext("/modules/modules-behind-mount-point");
+        this.schemaContextWithMountPoints = TestRestconfUtils.loadSchemaContext("/modules/mount-points");
 
         // create and register mount points
-        mountPoint = SimpleDOMMountPoint.create(
+        this.mountPoint = SimpleDOMMountPoint.create(
                 YangInstanceIdentifier.of(QName.create("mount:point:1", "2016-01-01", "cont")),
                 ImmutableClassToInstanceMap.copyOf(new HashMap<>()),
-                schemaContextBehindMountPoint
+                this.schemaContextBehindMountPoint
         );
 
-        mountPointWithNullSchemaContext = SimpleDOMMountPoint.create(
+        this.mountPointWithNullSchemaContext = SimpleDOMMountPoint.create(
                 YangInstanceIdentifier.of(QName.create("mount:point:2", "2016-01-01", "cont")),
                 ImmutableClassToInstanceMap.copyOf(new HashMap<>()),
                 null
         );
 
-        mountPointService = new DOMMountPointServiceImpl();
-        ((DOMMountPointServiceImpl) mountPointService).registerMountPoint(mountPoint);
-        ((DOMMountPointServiceImpl) mountPointService).registerMountPoint(mountPointWithNullSchemaContext);
-        when(mockMountPointHandler.getDOMMountPointService()).thenReturn(mountPointService);
+        this.mountPointService = new DOMMountPointServiceImpl();
+        ((DOMMountPointServiceImpl) this.mountPointService).registerMountPoint(this.mountPoint);
+        ((DOMMountPointServiceImpl) this.mountPointService).registerMountPoint(this.mountPointWithNullSchemaContext);
+        when(this.mockMountPointHandler.getDOMMountPointService()).thenReturn(this.mountPointService);
 
-        schemaService = new RestconfSchemaServiceImpl(mockContextHandler, mockMountPointHandler);
+        this.schemaService = new RestconfSchemaServiceImpl(this.mockContextHandler, this.mockMountPointHandler);
     }
 
     /**
@@ -109,7 +109,7 @@ public class RestconfSchemaServiceTest {
      */
     @Test
     public void schemaServiceImplInitTest() {
-        assertNotNull("Schema service should be initialized and not null", schemaService);
+        assertNotNull("Schema service should be initialized and not null", this.schemaService);
     }
 
     /**
@@ -118,10 +118,10 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaTest() {
         // prepare conditions - return not-mount point schema context
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContext);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContext);
 
         // make test
-        final SchemaExportContext exportContext = schemaService.getSchema(TEST_MODULE);
+        final SchemaExportContext exportContext = this.schemaService.getSchema(TEST_MODULE);
 
         // verify
         assertNotNull("Export context should not be null", exportContext);
@@ -142,10 +142,10 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaForNotExistingModuleTest() {
         // prepare conditions - return not-mount point schema context
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContext);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContext);
 
         // make test
-        final SchemaExportContext exportContext = schemaService.getSchema(NOT_EXISTING_MODULE);
+        final SchemaExportContext exportContext = this.schemaService.getSchema(NOT_EXISTING_MODULE);
 
         // verify
         assertNotNull("Export context should not be null", exportContext);
@@ -158,10 +158,10 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaMountPointTest() {
         // prepare conditions - return schema context with mount points
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContextWithMountPoints);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContextWithMountPoints);
 
         // make test
-        final SchemaExportContext exportContext = schemaService.getSchema(MOUNT_POINT + TEST_MODULE_BEHIND_MOUNT_POINT);
+        final SchemaExportContext exportContext = this.schemaService.getSchema(MOUNT_POINT + TEST_MODULE_BEHIND_MOUNT_POINT);
 
         // verify
         assertNotNull("Export context should not be null", exportContext);
@@ -182,10 +182,10 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaForNotExistingModuleMountPointTest() {
         // prepare conditions - return schema context with mount points
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContextWithMountPoints);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContextWithMountPoints);
 
         // make test
-        final SchemaExportContext exportContext = schemaService.getSchema(MOUNT_POINT + NOT_EXISTING_MODULE);
+        final SchemaExportContext exportContext = this.schemaService.getSchema(MOUNT_POINT + NOT_EXISTING_MODULE);
 
         // verify
         assertNotNull("Export context should not be null", exportContext);
@@ -198,11 +198,11 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaWithNullSchemaContextTest() {
         // prepare conditions - returned schema context is null
-        when(mockContextHandler.getSchemaContext()).thenReturn(null);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(null);
 
         // make test
-        thrown.expect(NullPointerException.class);
-        schemaService.getSchema(TEST_MODULE);
+        this.thrown.expect(NullPointerException.class);
+        this.schemaService.getSchema(TEST_MODULE);
     }
 
     /**
@@ -212,11 +212,11 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaWithNullSchemaContextMountPointTest() {
         // prepare conditions - returned schema context for mount points is null
-        when(mockContextHandler.getSchemaContext()).thenReturn(null);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(null);
 
         // make test
-        thrown.expect(NullPointerException.class);
-        schemaService.getSchema(MOUNT_POINT + TEST_MODULE_BEHIND_MOUNT_POINT);
+        this.thrown.expect(NullPointerException.class);
+        this.schemaService.getSchema(MOUNT_POINT + TEST_MODULE_BEHIND_MOUNT_POINT);
     }
 
     /**
@@ -226,12 +226,12 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaNullSchemaContextBehindMountPointTest() {
         // prepare conditions - return correct schema context for mount points (this is not null)
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContextWithMountPoints);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContextWithMountPoints);
 
         // make test - call service on mount point with null schema context
-        thrown.expect(NullPointerException.class);
+        this.thrown.expect(NullPointerException.class);
         // NULL_MOUNT_POINT contains null schema context
-        schemaService.getSchema(NULL_MOUNT_POINT + TEST_MODULE_BEHIND_MOUNT_POINT);
+        this.schemaService.getSchema(NULL_MOUNT_POINT + TEST_MODULE_BEHIND_MOUNT_POINT);
     }
 
     /**
@@ -241,11 +241,11 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaWithNullIdentifierTest() {
         // prepare conditions - return correct schema context
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContext);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContext);
 
         // make test
-        thrown.expect(NullPointerException.class);
-        schemaService.getSchema(null);
+        this.thrown.expect(NullPointerException.class);
+        this.schemaService.getSchema(null);
     }
 
     /**
@@ -255,13 +255,13 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaWithEmptyIdentifierTest() {
         // prepare conditions - return correct schema context
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContext);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContext);
 
         // make test and verify
         try {
-            schemaService.getSchema("");
+            this.schemaService.getSchema("");
             fail("Test should fail due to invalid identifier");
-        } catch (RestconfDocumentedException e) {
+        } catch (final RestconfDocumentedException e) {
             assertEquals(RestconfError.ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType());
             assertEquals(RestconfError.ErrorTag.INVALID_VALUE, e.getErrors().get(0).getErrorTag());
             assertEquals(400, e.getErrors().get(0).getErrorTag().getStatusCode());
@@ -276,13 +276,13 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaWithEmptyIdentifierMountPointTest() {
         // prepare conditions - return correct schema context with mount points
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContextWithMountPoints);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContextWithMountPoints);
 
         // make test and verify
         try {
-            schemaService.getSchema(MOUNT_POINT + "");
+            this.schemaService.getSchema(MOUNT_POINT + "");
             fail("Test should fail due to invalid identifier");
-        } catch (RestconfDocumentedException e) {
+        } catch (final RestconfDocumentedException e) {
             assertEquals(RestconfError.ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType());
             assertEquals(RestconfError.ErrorTag.INVALID_VALUE, e.getErrors().get(0).getErrorTag());
             assertEquals(400, e.getErrors().get(0).getErrorTag().getStatusCode());
@@ -296,13 +296,13 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaWithNotParsableIdentifierTest() {
         // prepare conditions - return correct schema context without mount points
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContext);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContext);
 
         // make test and verify
         try {
-            schemaService.getSchema("01_module/2016-01-01");
+            this.schemaService.getSchema("01_module/2016-01-01");
             fail("Test should fail due to invalid identifier");
-        } catch (RestconfDocumentedException e) {
+        } catch (final RestconfDocumentedException e) {
             assertEquals(RestconfError.ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType());
             assertEquals(RestconfError.ErrorTag.INVALID_VALUE, e.getErrors().get(0).getErrorTag());
             assertEquals(400, e.getErrors().get(0).getErrorTag().getStatusCode());
@@ -317,13 +317,13 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaWithNotParsableIdentifierMountPointTest() {
         // prepare conditions - return correct schema context with mount points
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContextWithMountPoints);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContextWithMountPoints);
 
         // make test and verify
         try {
-            schemaService.getSchema(MOUNT_POINT + "01_module/2016-01-01");
+            this.schemaService.getSchema(MOUNT_POINT + "01_module/2016-01-01");
             fail("Test should fail due to invalid identifier");
-        } catch (RestconfDocumentedException e) {
+        } catch (final RestconfDocumentedException e) {
             assertEquals(RestconfError.ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType());
             assertEquals(RestconfError.ErrorTag.INVALID_VALUE, e.getErrors().get(0).getErrorTag());
             assertEquals(400, e.getErrors().get(0).getErrorTag().getStatusCode());
@@ -339,13 +339,13 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaWrongIdentifierTest() {
         // prepare conditions - return correct schema context without mount points
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContext);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContext);
 
         // make test and verify
         try {
-            schemaService.getSchema("2014-01-01");
+            this.schemaService.getSchema("2014-01-01");
             fail("Test should fail due to invalid identifier");
-        } catch (RestconfDocumentedException e) {
+        } catch (final RestconfDocumentedException e) {
             assertEquals(RestconfError.ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType());
             assertEquals(RestconfError.ErrorTag.INVALID_VALUE, e.getErrors().get(0).getErrorTag());
             assertEquals(400, e.getErrors().get(0).getErrorTag().getStatusCode());
@@ -362,13 +362,13 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaWrongIdentifierMountPointTest() {
         // prepare conditions - return correct schema context with mount points
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContextWithMountPoints);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContextWithMountPoints);
 
         // make test and verify
         try {
-            schemaService.getSchema(MOUNT_POINT + "2014-01-01");
+            this.schemaService.getSchema(MOUNT_POINT + "2014-01-01");
             fail("Test should fail due to invalid identifier");
-        } catch (RestconfDocumentedException e) {
+        } catch (final RestconfDocumentedException e) {
             assertEquals(RestconfError.ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType());
             assertEquals(RestconfError.ErrorTag.INVALID_VALUE, e.getErrors().get(0).getErrorTag());
             assertEquals(400, e.getErrors().get(0).getErrorTag().getStatusCode());
@@ -383,13 +383,13 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaWithoutRevisionTest() {
         // prepare conditions - return correct schema context without mount points
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContext);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContext);
 
         // make test and verify
         try {
-            schemaService.getSchema("module");
+            this.schemaService.getSchema("module");
             fail("Test should fail due to invalid identifier");
-        } catch (RestconfDocumentedException e) {
+        } catch (final RestconfDocumentedException e) {
             assertEquals(RestconfError.ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType());
             assertEquals(RestconfError.ErrorTag.INVALID_VALUE, e.getErrors().get(0).getErrorTag());
             assertEquals(400, e.getErrors().get(0).getErrorTag().getStatusCode());
@@ -404,13 +404,13 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaWithoutRevisionMountPointTest() {
         // prepare conditions - return correct schema context with mount points
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContextWithMountPoints);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContextWithMountPoints);
 
         // make test and verify
         try {
-            schemaService.getSchema(MOUNT_POINT + "module");
+            this.schemaService.getSchema(MOUNT_POINT + "module");
             fail("Test should fail due to invalid identifier");
-        } catch (RestconfDocumentedException e) {
+        } catch (final RestconfDocumentedException e) {
             assertEquals(RestconfError.ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType());
             assertEquals(RestconfError.ErrorTag.INVALID_VALUE, e.getErrors().get(0).getErrorTag());
             assertEquals(400, e.getErrors().get(0).getErrorTag().getStatusCode());
@@ -424,10 +424,10 @@ public class RestconfSchemaServiceTest {
     @Test
     public void getSchemaContextWithNotExistingMountPointTest() {
         // prepare conditions - return schema context with mount points
-        when(mockContextHandler.getSchemaContext()).thenReturn(schemaContextWithMountPoints);
+        when(this.mockContextHandler.getSchemaContext()).thenReturn(this.schemaContextWithMountPoints);
 
         // make test
-        thrown.expect(IllegalArgumentException.class);
-        schemaService.getSchema(NOT_EXISTING_MOUNT_POINT + TEST_MODULE_BEHIND_MOUNT_POINT);
+        this.thrown.expect(IllegalArgumentException.class);
+        this.schemaService.getSchema(NOT_EXISTING_MOUNT_POINT + TEST_MODULE_BEHIND_MOUNT_POINT);
     }
 }

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/impl/services/RestconfStreamsServiceTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/impl/services/RestconfStreamsServiceTest.java
index b9dc6dafdb5004b7ed4b589ba1df757213180058..d4754e849d615b9d0f47078d63531f4b8c82a91d 100644 (file)
--- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/impl/services/RestconfStreamsServiceTest.java
+++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/impl/services/RestconfStreamsServiceTest.java
@@ -15,9 +15,6 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.when;
 import static org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.EMPTY;
-import static org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import static org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
-
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import java.util.AbstractMap;
@@ -41,10 +38,13 @@ import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfError;
 import org.opendaylight.netconf.sal.streams.listeners.Notificator;
 import org.opendaylight.restconf.Draft11;
-import org.opendaylight.restconf.rest.api.schema.context.SchemaContextHandler;
-import org.opendaylight.restconf.rest.api.services.RestconfStreamsService;
+import org.opendaylight.restconf.common.handlers.api.SchemaContextHandler;
+import org.opendaylight.restconf.rest.services.api.RestconfStreamsService;
+import org.opendaylight.restconf.rest.services.impl.RestconfStreamsServiceImpl;
 import org.opendaylight.restconf.utils.mapping.RestconfMappingNodeConstants;
 import org.opendaylight.restconf.utils.mapping.RestconfMappingStreamConstants;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
@@ -98,7 +98,7 @@ public class RestconfStreamsServiceTest {
      */
     @Test
     public void restconfStreamsServiceImplInitTest() {
-        assertNotNull("Streams service should be initialized and not null", streamsService);
+        assertNotNull("Streams service should be initialized and not null", this.streamsService);
     }
 
     /**
@@ -108,13 +108,13 @@ public class RestconfStreamsServiceTest {
     @Test
     public void getAvailableStreamsTest() throws Exception {
         // prepare conditions - get correct Restconf module
-        when(contextHandler.getSchemaContext()).thenReturn(mockSchemaContext);
-        when(mockSchemaContext.findModuleByNamespaceAndRevision(Draft11.RestconfModule.IETF_RESTCONF_QNAME
+        when(this.contextHandler.getSchemaContext()).thenReturn(this.mockSchemaContext);
+        when(this.mockSchemaContext.findModuleByNamespaceAndRevision(Draft11.RestconfModule.IETF_RESTCONF_QNAME
                 .getNamespace(), Draft11.RestconfModule.IETF_RESTCONF_QNAME.getRevision()))
                 .thenReturn(getTestingRestconfModule("ietf-restconf"));
 
         // make test
-        final NormalizedNodeContext nodeContext = streamsService.getAvailableStreams(null);
+        final NormalizedNodeContext nodeContext = this.streamsService.getAvailableStreams(null);
 
         // verify loaded streams
         assertNotNull("Normalized node context should not be null", nodeContext);
@@ -128,11 +128,11 @@ public class RestconfStreamsServiceTest {
     @Test
     public void getAvailableStreamsNullSchemaContextNegativeTest() {
         // prepare conditions - returned SchemaContext is null
-        when(contextHandler.getSchemaContext()).thenReturn(null);
+        when(this.contextHandler.getSchemaContext()).thenReturn(null);
 
         // make test
-        thrown.expect(NullPointerException.class);
-        streamsService.getAvailableStreams(null);
+        this.thrown.expect(NullPointerException.class);
+        this.streamsService.getAvailableStreams(null);
     }
 
     /**
@@ -142,13 +142,13 @@ public class RestconfStreamsServiceTest {
     @Test
     public void getAvailableStreamsMissingRestconfModuleNegativeTest() {
         // prepare conditions - get null Restconf module
-        when(contextHandler.getSchemaContext()).thenReturn(mockSchemaContext);
-        when(mockSchemaContext.findModuleByNamespaceAndRevision(Draft11.RestconfModule.IETF_RESTCONF_QNAME
+        when(this.contextHandler.getSchemaContext()).thenReturn(this.mockSchemaContext);
+        when(this.mockSchemaContext.findModuleByNamespaceAndRevision(Draft11.RestconfModule.IETF_RESTCONF_QNAME
                 .getNamespace(), Draft11.RestconfModule.IETF_RESTCONF_QNAME.getRevision())).thenReturn(null);
 
         // make test
-        thrown.expect(NullPointerException.class);
-        streamsService.getAvailableStreams(null);
+        this.thrown.expect(NullPointerException.class);
+        this.streamsService.getAvailableStreams(null);
     }
 
     /**
@@ -159,14 +159,14 @@ public class RestconfStreamsServiceTest {
     @Test
     public void getAvailableStreamsMissingListStreamNegativeTest() {
         // prepare conditions - get Restconf module with missing list stream
-        when(contextHandler.getSchemaContext()).thenReturn(mockSchemaContext);
-        when(mockSchemaContext.findModuleByNamespaceAndRevision(Draft11.RestconfModule.IETF_RESTCONF_QNAME
+        when(this.contextHandler.getSchemaContext()).thenReturn(this.mockSchemaContext);
+        when(this.mockSchemaContext.findModuleByNamespaceAndRevision(Draft11.RestconfModule.IETF_RESTCONF_QNAME
                 .getNamespace(), Draft11.RestconfModule.IETF_RESTCONF_QNAME.getRevision()))
                 .thenReturn(getTestingRestconfModule("restconf-module-with-missing-list-stream"));
 
         // make test and verify
         try {
-            streamsService.getAvailableStreams(null);
+            this.streamsService.getAvailableStreams(null);
             fail("Test is expected to fail due to missing list stream");
         } catch (final RestconfDocumentedException e) {
             assertEquals("Error type is not correct",
@@ -186,14 +186,14 @@ public class RestconfStreamsServiceTest {
     @Test
     public void getAvailableStreamsMissingContainerStreamsNegativeTest() {
         // prepare conditions - get Restconf module with missing container streams
-        when(contextHandler.getSchemaContext()).thenReturn(mockSchemaContext);
-        when(mockSchemaContext.findModuleByNamespaceAndRevision(Draft11.RestconfModule.IETF_RESTCONF_QNAME
+        when(this.contextHandler.getSchemaContext()).thenReturn(this.mockSchemaContext);
+        when(this.mockSchemaContext.findModuleByNamespaceAndRevision(Draft11.RestconfModule.IETF_RESTCONF_QNAME
                 .getNamespace(), Draft11.RestconfModule.IETF_RESTCONF_QNAME.getRevision()))
                 .thenReturn(getTestingRestconfModule("restconf-module-with-missing-container-streams"));
 
         // make test and verify
         try {
-            streamsService.getAvailableStreams(null);
+            this.streamsService.getAvailableStreams(null);
             fail("Test is expected to fail due to missing container streams");
         } catch (final RestconfDocumentedException e) {
             assertEquals("Error type is not correct",
@@ -212,14 +212,14 @@ public class RestconfStreamsServiceTest {
     @Test
     public void getAvailableStreamsIllegalListStreamNegativeTest() {
         // prepare conditions - get Restconf module with illegal list stream
-        when(contextHandler.getSchemaContext()).thenReturn(mockSchemaContext);
-        when(mockSchemaContext.findModuleByNamespaceAndRevision(Draft11.RestconfModule.IETF_RESTCONF_QNAME
+        when(this.contextHandler.getSchemaContext()).thenReturn(this.mockSchemaContext);
+        when(this.mockSchemaContext.findModuleByNamespaceAndRevision(Draft11.RestconfModule.IETF_RESTCONF_QNAME
                 .getNamespace(), Draft11.RestconfModule.IETF_RESTCONF_QNAME.getRevision()))
                 .thenReturn(getTestingRestconfModule("restconf-module-with-illegal-list-stream"));
 
         // make test
-        thrown.expect(IllegalStateException.class);
-        streamsService.getAvailableStreams(null);
+        this.thrown.expect(IllegalStateException.class);
+        this.streamsService.getAvailableStreams(null);
     }
 
     /**
@@ -229,14 +229,14 @@ public class RestconfStreamsServiceTest {
     @Test
     public void getAvailableStreamsIllegalContainerStreamsNegativeTest() {
         // prepare conditions - get Restconf module with illegal container streams
-        when(contextHandler.getSchemaContext()).thenReturn(mockSchemaContext);
-        when(mockSchemaContext.findModuleByNamespaceAndRevision(Draft11.RestconfModule.IETF_RESTCONF_QNAME
+        when(this.contextHandler.getSchemaContext()).thenReturn(this.mockSchemaContext);
+        when(this.mockSchemaContext.findModuleByNamespaceAndRevision(Draft11.RestconfModule.IETF_RESTCONF_QNAME
                 .getNamespace(), Draft11.RestconfModule.IETF_RESTCONF_QNAME.getRevision()))
                 .thenReturn(getTestingRestconfModule("restconf-module-with-illegal-container-streams"));
 
         // make test
-        thrown.expect(IllegalStateException.class);
-        streamsService.getAvailableStreams(null);
+        this.thrown.expect(IllegalStateException.class);
+        this.streamsService.getAvailableStreams(null);
     }
 
     /**
@@ -246,14 +246,14 @@ public class RestconfStreamsServiceTest {
     @Test
     public void getAvailableStreamsIllegalLeafDescriptionNegativeTest() {
         // prepare conditions - get Restconf module with illegal leaf description in list stream
-        when(contextHandler.getSchemaContext()).thenReturn(mockSchemaContext);
-        when(mockSchemaContext.findModuleByNamespaceAndRevision(Draft11.RestconfModule.IETF_RESTCONF_QNAME
+        when(this.contextHandler.getSchemaContext()).thenReturn(this.mockSchemaContext);
+        when(this.mockSchemaContext.findModuleByNamespaceAndRevision(Draft11.RestconfModule.IETF_RESTCONF_QNAME
                 .getNamespace(), Draft11.RestconfModule.IETF_RESTCONF_QNAME.getRevision()))
                 .thenReturn(getTestingRestconfModule("restconf-module-with-illegal-leaf-description"));
 
         // make test
-        thrown.expect(IllegalStateException.class);
-        streamsService.getAvailableStreams(null);
+        this.thrown.expect(IllegalStateException.class);
+        this.streamsService.getAvailableStreams(null);
     }
 
     /**
@@ -263,7 +263,7 @@ public class RestconfStreamsServiceTest {
      * @return Restconf module
      */
     private Module getTestingRestconfModule(final String s) {
-        return schemaContext.findModuleByName(s, Draft11.RestconfModule.IETF_RESTCONF_QNAME.getRevision());
+        return this.schemaContext.findModuleByName(s, Draft11.RestconfModule.IETF_RESTCONF_QNAME.getRevision());
     }
 
     /**