Bug 7735 - Update restconf models by RFC 8040

[netconf.git] / restconf / sal-rest-connector / src / main / java / org / opendaylight / RestconfWrapperProviders.java

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..ec634bcd9b44b3e765dfe9cb329b85c358b03081 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,25 +12,25 @@ 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.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
+import org.opendaylight.restconf.RestConnectorProvider;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 
 /**
- * Wrapping providers from restconf draft02 and draft11.
+ * Wrapping providers from restconf draft02 and draft18.
  *
  */
 public class RestconfWrapperProviders implements AutoCloseable, RestConnector {
 
     // DRAFT02
     private final RestconfProviderImpl providerDraft02;
-    // DRAFT11
-    private final RestConnectorProvider providerDraft11;
+    // DRAFT18
+    private final RestConnectorProvider providerDraft18;
 
     /**
      * Init both providers:
      * <ul>
      * <li>draft02 - {@link RestconfProviderImpl}
-     * <li>draft11 - {@link RestConnectorProvider}
+     * <li>draft18 - {@link RestConnectorProvider}
      * </ul>
      *
      * @param port
@@ -41,15 +41,14 @@ public class RestconfWrapperProviders implements AutoCloseable, RestConnector {
         this.providerDraft02 = new RestconfProviderImpl();
         this.providerDraft02.setWebsocketPort(port);
 
-        // Init draft11 provider
-        this.providerDraft11 = new RestConnectorProvider();
+        this.providerDraft18 = new RestConnectorProvider();
     }
 
     /**
      * Register both providers, which will use the SAL layer:
      * <ul>
      * <li>draft02 - {@link RestconfProviderImpl}
-     * <li>draft11 - {@link RestConnectorProvider}
+     * <li>draft18 - {@link RestConnectorProvider}
      * </ul>
      *
      * @param broker
@@ -59,8 +58,8 @@ public class RestconfWrapperProviders implements AutoCloseable, RestConnector {
         // Register draft02 provider
         broker.registerProvider(this.providerDraft02);
 
-        // Register draft11 provider
-        broker.registerProvider(this.providerDraft11);
+        // Register draft18 provider
+        broker.registerProvider(this.providerDraft18);
     }
 
     /**
@@ -78,7 +77,7 @@ public class RestconfWrapperProviders implements AutoCloseable, RestConnector {
     @Override
     public void close() throws Exception {
         this.providerDraft02.close();
-        this.providerDraft11.close();
+        this.providerDraft18.close();
     }
 
 }