Remove superfulous class from neutron NB bundle.

[controller.git] / opendaylight / northbound / networkconfiguration / neutron / src / main / java / org / opendaylight / controller / networkconfig / neutron / northbound / NeutronNetworksNorthbound.java

diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java b/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java
index 2505da62cf255235d6d84cbf8d257e0d402e3fb5..383009b9d519366d9ffd3efe17783ad0be7624ad 100644 (file)
--- a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java
+++ b/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java
@@ -29,6 +29,7 @@ import org.codehaus.enunciate.jaxrs.StatusCodes;
 import org.codehaus.enunciate.jaxrs.TypeHint;\r
 import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkAware;\r
 import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;\r
+import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;\r
 import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;\r
 import org.opendaylight.controller.northbound.commons.RestMessages;\r
 import org.opendaylight.controller.northbound.commons.exception.ServiceUnavailableException;\r
@@ -88,7 +89,7 @@ public class NeutronNetworksNorthbound {
             @QueryParam("page_reverse") String pageReverse\r
             // sorting not supported\r
         ) {\r
-        INeutronNetworkCRUD networkInterface = NeutronNBInterfaces.getIfNBNetworkCRUD("default", this);\r
+        INeutronNetworkCRUD networkInterface = NeutronCRUDInterfaces.getINeutronNetworkCRUD( this);\r
         if (networkInterface == null) {\r
             throw new ServiceUnavailableException("Network CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
@@ -103,11 +104,11 @@ public class NeutronNetworksNorthbound {
             Boolean bShared = null;\r
             Boolean bRouterExternal = null;\r
             if (queryAdminStateUp != null)\r
-                bAdminStateUp = new Boolean(queryAdminStateUp);\r
+                bAdminStateUp = Boolean.valueOf(queryAdminStateUp);\r
             if (queryShared != null)\r
-                bShared = new Boolean(queryShared);\r
+                bShared = Boolean.valueOf(queryShared);\r
             if (queryRouterExternal != null)\r
-                bRouterExternal = new Boolean(queryRouterExternal);\r
+                bRouterExternal = Boolean.valueOf(queryRouterExternal);\r
             if ((queryID == null || queryID.equals(oSN.getID())) &&\r
                     (queryName == null || queryName.equals(oSN.getNetworkName())) &&\r
                     (bAdminStateUp == null || bAdminStateUp.booleanValue() == oSN.isAdminStateUp()) &&\r
@@ -142,7 +143,7 @@ public class NeutronNetworksNorthbound {
             // return fields\r
             @QueryParam("fields") List<String> fields\r
             ) {\r
-        INeutronNetworkCRUD networkInterface = NeutronNBInterfaces.getIfNBNetworkCRUD("default", this);\r
+        INeutronNetworkCRUD networkInterface = NeutronCRUDInterfaces.getINeutronNetworkCRUD( this);\r
         if (networkInterface == null) {\r
             throw new ServiceUnavailableException("Network CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
@@ -169,7 +170,7 @@ public class NeutronNetworksNorthbound {
             @ResponseCode(code = 400, condition = "Bad Request"),\r
             @ResponseCode(code = 401, condition = "Unauthorized") })\r
     public Response createNetworks(final NeutronNetworkRequest input) {\r
-        INeutronNetworkCRUD networkInterface = NeutronNBInterfaces.getIfNBNetworkCRUD("default", this);\r
+        INeutronNetworkCRUD networkInterface = NeutronCRUDInterfaces.getINeutronNetworkCRUD( this);\r
         if (networkInterface == null) {\r
             throw new ServiceUnavailableException("Network CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
@@ -261,7 +262,7 @@ public class NeutronNetworksNorthbound {
     public Response updateNetwork(\r
             @PathParam("netUUID") String netUUID, final NeutronNetworkRequest input\r
             ) {\r
-        INeutronNetworkCRUD networkInterface = NeutronNBInterfaces.getIfNBNetworkCRUD("default", this);\r
+        INeutronNetworkCRUD networkInterface = NeutronCRUDInterfaces.getINeutronNetworkCRUD( this);\r
         if (networkInterface == null) {\r
             throw new ServiceUnavailableException("Network CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
@@ -319,7 +320,7 @@ public class NeutronNetworksNorthbound {
             @ResponseCode(code = 409, condition = "Network In Use") })\r
     public Response deleteNetwork(\r
             @PathParam("netUUID") String netUUID) {\r
-        INeutronNetworkCRUD networkInterface = NeutronNBInterfaces.getIfNBNetworkCRUD("default", this);\r
+        INeutronNetworkCRUD networkInterface = NeutronCRUDInterfaces.getINeutronNetworkCRUD( this);\r
         if (networkInterface == null) {\r
             throw new ServiceUnavailableException("Network CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r