Code Review / neutron.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
spi: consolidate common member
[neutron.git] / northbound-api / src / main / java / org / opendaylight / neutron / northbound / api / NeutronLoadBalancerListenerNorthbound.java
diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
index b9ffe256fb392ed64a487086c17953dd3d12b713..34288681fcfdf39ad6316b68ed5b4015cdf44e3f 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
@@ -9,11 +9,9 @@
 package org.opendaylight.neutron.northbound.api;
 
 import java.net.HttpURLConnection;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -25,12 +23,9 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerAware;
 import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerCRUD;
-import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
 import org.opendaylight.neutron.spi.NeutronLoadBalancerListener;
 
 /**
@@ -51,8 +46,8 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancerListener;
  *
  */
 @Path("/lbaas/listeners")
-public class NeutronLoadBalancerListenerNorthbound
-    extends AbstractNeutronNorthboundIAware<NeutronLoadBalancerListener, NeutronLoadBalancerListenerRequest, INeutronLoadBalancerListenerCRUD, INeutronLoadBalancerListenerAware> {
+public final class NeutronLoadBalancerListenerNorthbound extends AbstractNeutronNorthbound<NeutronLoadBalancerListener,
+        NeutronLoadBalancerListenerRequest, INeutronLoadBalancerListenerCRUD> {
 
     private static final String RESOURCE_NAME = "LoadBalancerListener";
 
@@ -61,72 +56,11 @@ public class NeutronLoadBalancerListenerNorthbound
         return RESOURCE_NAME;
     }
 
-    @Override
-    protected NeutronLoadBalancerListener extractFields(NeutronLoadBalancerListener o, List<String> fields) {
-        return o.extractFields(fields);
-    }
-
-    @Override
-    protected NeutronLoadBalancerListenerRequest newNeutronRequest(NeutronLoadBalancerListener o) {
-        return new NeutronLoadBalancerListenerRequest(o);
-    }
-
-    @Override
-    protected INeutronLoadBalancerListenerCRUD getNeutronCRUD() {
-        NeutronCRUDInterfaces answer = new NeutronCRUDInterfaces().fetchINeutronLoadBalancerListenerCRUD(this);
-        if (answer.getLoadBalancerListenerInterface() == null) {
-            throw new ServiceUnavailableException(serviceUnavailable());
-        }
-        return answer.getLoadBalancerListenerInterface();
-    }
-
-    @Override
-    protected Object[] getInstances() {
-        return NeutronUtil.getInstances(INeutronLoadBalancerListenerAware.class, this);
-    }
-
-    @Override
-    protected int canCreate(Object instance, NeutronLoadBalancerListener singleton) {
-        INeutronLoadBalancerListenerAware service = (INeutronLoadBalancerListenerAware) instance;
-        return service.canCreateNeutronLoadBalancerListener(singleton);
-    }
-
-    @Override
-    protected void created(Object instance, NeutronLoadBalancerListener singleton) {
-        INeutronLoadBalancerListenerAware service = (INeutronLoadBalancerListenerAware) instance;
-        service.neutronLoadBalancerListenerCreated(singleton);
-    }
-
-    @Override
-    protected int canUpdate(Object instance, NeutronLoadBalancerListener delta, NeutronLoadBalancerListener original) {
-        INeutronLoadBalancerListenerAware service = (INeutronLoadBalancerListenerAware) instance;
-        return service.canUpdateNeutronLoadBalancerListener(delta, original);
-    }
-
-    @Override
-    protected void updated(Object instance, NeutronLoadBalancerListener updated) {
-        INeutronLoadBalancerListenerAware service = (INeutronLoadBalancerListenerAware) instance;
-        service.neutronLoadBalancerListenerUpdated(updated);
-    }
-
-    @Override
-    protected int canDelete(Object instance, NeutronLoadBalancerListener singleton) {
-        INeutronLoadBalancerListenerAware service = (INeutronLoadBalancerListenerAware) instance;
-        return service.canDeleteNeutronLoadBalancerListener(singleton);
-    }
-
-    @Override
-    protected void deleted(Object instance, NeutronLoadBalancerListener singleton) {
-        INeutronLoadBalancerListenerAware service = (INeutronLoadBalancerListenerAware) instance;
-        service.neutronLoadBalancerListenerDeleted(singleton);
-    }
-
     /**
      * Returns a list of all LoadBalancerListener */
     @GET
     @Produces({ MediaType.APPLICATION_JSON })
-    @StatusCodes({
-            @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"),
+    @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"),
             @ResponseCode(code = HttpURLConnection.HTTP_UNAUTHORIZED, condition = "Unauthorized"),
             @ResponseCode(code = HttpURLConnection.HTTP_NOT_IMPLEMENTED, condition = "Not Implemented"),
             @ResponseCode(code = HttpURLConnection.HTTP_UNAVAILABLE, condition = "No providers available") })
@@ -139,47 +73,42 @@ public class NeutronLoadBalancerListenerNorthbound
             @QueryParam("default_pool_id") String queryLoadBalancerListenerDefaultPoolID,
             @QueryParam("tenant_id") String queryLoadBalancerListenerTenantID,
             @QueryParam("name") String queryLoadBalancerListenerName,
-            @QueryParam("description") String queryLoadBalancerListenerDescription,
             @QueryParam("protocol") String queryLoadBalancerListenerProtocol,
             @QueryParam("protocol_port") String queryLoadBalancerListenerProtocolPort,
-            @QueryParam("admin_state_up") String queryLoadBalancerListenerAdminIsUp,
+            @QueryParam("admin_state_up") Boolean queryLoadBalancerListenerAdminIsUp,
             // pagination
             @QueryParam("limit") String limit,
             @QueryParam("marker") String marker,
             @QueryParam("page_reverse") String pageReverse
-            // sorting not supported
+    // sorting not supported
     ) {
         INeutronLoadBalancerListenerCRUD loadBalancerListenerInterface = getNeutronCRUD();
-        List<NeutronLoadBalancerListener> allLoadBalancerListeners = loadBalancerListenerInterface.getAllNeutronLoadBalancerListeners();
-        List<NeutronLoadBalancerListener> ans = new ArrayList<NeutronLoadBalancerListener>();
+        List<NeutronLoadBalancerListener> allLoadBalancerListeners = loadBalancerListenerInterface.getAll();
+        List<NeutronLoadBalancerListener> ans = new ArrayList<>();
         Iterator<NeutronLoadBalancerListener> i = allLoadBalancerListeners.iterator();
         while (i.hasNext()) {
             NeutronLoadBalancerListener nsg = i.next();
-            if ((queryLoadBalancerListenerID == null ||
-                    queryLoadBalancerListenerID.equals(nsg.getID())) &&
-                    (queryLoadBalancerListenerDefaultPoolID == null ||
-                            queryLoadBalancerListenerDefaultPoolID.equals(nsg.getNeutronLoadBalancerListenerDefaultPoolID())) &&
-                    (queryLoadBalancerListenerTenantID == null ||
-                            queryLoadBalancerListenerTenantID.equals(nsg.getTenantID())) &&
-                    (queryLoadBalancerListenerName == null ||
-                            queryLoadBalancerListenerName.equals(nsg.getLoadBalancerListenerName())) &&
-                    (queryLoadBalancerListenerDescription == null ||
-                            queryLoadBalancerListenerDescription.equals(nsg.getLoadBalancerListenerDescription())) &&
-                    (queryLoadBalancerListenerProtocol == null ||
-                            queryLoadBalancerListenerProtocol.equals(nsg.getNeutronLoadBalancerListenerProtocol())) &&
-                    (queryLoadBalancerListenerProtocolPort == null ||
-                            queryLoadBalancerListenerProtocolPort.equals(nsg.getNeutronLoadBalancerListenerProtocolPort())) &&
-                    (queryLoadBalancerListenerAdminIsUp == null ||
-                            queryLoadBalancerListenerAdminIsUp.equals(nsg.getLoadBalancerListenerAdminStateIsUp()))) {
+            if ((queryLoadBalancerListenerID == null || queryLoadBalancerListenerID.equals(nsg.getID()))
+                    && (queryLoadBalancerListenerDefaultPoolID == null || queryLoadBalancerListenerDefaultPoolID
+                            .equals(nsg.getNeutronLoadBalancerListenerDefaultPoolID()))
+                    && (queryLoadBalancerListenerTenantID == null
+                            || queryLoadBalancerListenerTenantID.equals(nsg.getTenantID()))
+                    && (queryLoadBalancerListenerName == null
+                            || queryLoadBalancerListenerName.equals(nsg.getName()))
+                    && (queryLoadBalancerListenerProtocol == null
+                            || queryLoadBalancerListenerProtocol.equals(nsg.getNeutronLoadBalancerListenerProtocol()))
+                    && (queryLoadBalancerListenerProtocolPort == null || queryLoadBalancerListenerProtocolPort
+                            .equals(nsg.getNeutronLoadBalancerListenerProtocolPort()))
+                    && (queryLoadBalancerListenerAdminIsUp == null || queryLoadBalancerListenerAdminIsUp
+                            .equals(nsg.getLoadBalancerListenerAdminStateIsUp()))) {
                 if (fields.size() > 0) {
-                    ans.add(extractFields(nsg,fields));
+                    ans.add(nsg.extractFields(fields));
                 } else {
                     ans.add(nsg);
                 }
             }
         }
-        return Response.status(HttpURLConnection.HTTP_OK).entity(
-                new NeutronLoadBalancerListenerRequest(ans)).build();
+        return Response.status(HttpURLConnection.HTTP_OK).entity(new NeutronLoadBalancerListenerRequest(ans)).build();
     }
 
     /**
@@ -188,8 +117,7 @@ public class NeutronLoadBalancerListenerNorthbound
     @Path("{loadBalancerListenerID}")
     @GET
     @Produces({ MediaType.APPLICATION_JSON })
-    @StatusCodes({
-            @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"),
+    @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"),
             @ResponseCode(code = HttpURLConnection.HTTP_UNAUTHORIZED, condition = "Unauthorized"),
             @ResponseCode(code = HttpURLConnection.HTTP_NOT_FOUND, condition = "Not Found"),
             @ResponseCode(code = HttpURLConnection.HTTP_NOT_IMPLEMENTED, condition = "Not Implemented"),
@@ -206,8 +134,7 @@ public class NeutronLoadBalancerListenerNorthbound
     @POST
     @Produces({ MediaType.APPLICATION_JSON })
     @Consumes({ MediaType.APPLICATION_JSON })
-    @StatusCodes({
-            @ResponseCode(code = HttpURLConnection.HTTP_CREATED, condition = "Created"),
+    @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_CREATED, condition = "Created"),
             @ResponseCode(code = HttpURLConnection.HTTP_UNAVAILABLE, condition = "No providers available") })
     public Response createLoadBalancerListeners(final NeutronLoadBalancerListenerRequest input) {
         return create(input);
@@ -220,11 +147,11 @@ public class NeutronLoadBalancerListenerNorthbound
     @PUT
     @Produces({ MediaType.APPLICATION_JSON })
     @Consumes({ MediaType.APPLICATION_JSON })
-    @StatusCodes({
-            @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"),
+    @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"),
+            @ResponseCode(code = HttpURLConnection.HTTP_NOT_FOUND, condition = "Not Found"),
             @ResponseCode(code = HttpURLConnection.HTTP_UNAVAILABLE, condition = "No providers available") })
-    public Response updateLoadBalancerListener(
-            @PathParam("loadBalancerListenerID") String loadBalancerListenerID, final NeutronLoadBalancerListenerRequest input) {
+    public Response updateLoadBalancerListener(@PathParam("loadBalancerListenerID") String loadBalancerListenerID,
+            final NeutronLoadBalancerListenerRequest input) {
         return update(loadBalancerListenerID, input);
     }
 
@@ -233,11 +160,10 @@ public class NeutronLoadBalancerListenerNorthbound
 
     @Path("{loadBalancerListenerID}")
     @DELETE
-    @StatusCodes({
-            @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"),
+    @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"),
+            @ResponseCode(code = HttpURLConnection.HTTP_NOT_FOUND, condition = "Not Found"),
             @ResponseCode(code = HttpURLConnection.HTTP_UNAVAILABLE, condition = "No providers available") })
-    public Response deleteLoadBalancerListener(
-            @PathParam("loadBalancerListenerID") String loadBalancerListenerID) {
+    public Response deleteLoadBalancerListener(@PathParam("loadBalancerListenerID") String loadBalancerListenerID) {
         return delete(loadBalancerListenerID);
     }
 }
Neutron Northbound