northbound: code clean up 90/45290/1
authorIsaku Yamahata <isaku.yamahata@intel.com>
Wed, 7 Sep 2016 08:04:06 +0000 (01:04 -0700)
committerIsaku Yamahata <isaku.yamahata@intel.com>
Wed, 7 Sep 2016 08:25:06 +0000 (01:25 -0700)
- sprinkle final to public class
- remove unused variable, uriinfo
- misc improvements

Change-Id: Ied5692ef500a768949e7a010266953b097790d7f
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
33 files changed:
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/AbstractNeutronNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/INeutronRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronBgpvpnsNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIPsNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayConnectionNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRulesNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelsNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNorthboundRSApplication.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPageLink.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronQosPolicyNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCFlowClassifiersNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortChainsNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairGroupsNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairsNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVPNIKEPoliciesNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVPNIPSECPoliciesNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVPNIPSECSiteConnectionsNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVPNServicesNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/PaginatedRequestFactory.java

index 2bad42d3a041b1f06f48280fd69e61ff4ca02aed..61ad7175e086a83f2c2ca7effc10ebf403291b4d 100644 (file)
@@ -137,11 +137,11 @@ public abstract class AbstractNeutronNorthbound<T extends INeutronObject<T>, Neu
         /*
          * remove it and return 204 status
          */
-        final String resourceName = getResourceName();
         boolean exist = false;
         try {
             exist = neutronCRUD.remove(uuid);
         } catch (Exception e) {
+            final String resourceName = getResourceName();
             LOGGER.debug("exception during remove {} {} {}", resourceName, uuid, e);
             throw new InternalServerErrorException("Could not delete " + resourceName);
         }
index 7a376b221a7b2fea1b7026bd7c45e6e08e7219e0..32cf45ab8c84fbac2e532faddca5cc55c8ecea5c 100644 (file)
@@ -14,6 +14,7 @@ import org.opendaylight.neutron.spi.INeutronObject;
 
 public interface INeutronRequest<T extends INeutronObject<T>> {
     default T getSingleton() {
+        // return this.sinleton;
         Class aClass = getClass();
         try {
             Field field = aClass.getDeclaredField("singleton");
@@ -24,6 +25,7 @@ public interface INeutronRequest<T extends INeutronObject<T>> {
     }
 
     default boolean isSingleton() {
+        // return this.sinleton != null;
         Class aClass = getClass();
         try {
             Field field = aClass.getDeclaredField("singleton");
@@ -34,6 +36,7 @@ public interface INeutronRequest<T extends INeutronObject<T>> {
     }
 
     default List<T> getBulk() {
+        // return this.bulkRequest;
         Class aClass = getClass();
         try {
             Field field = aClass.getDeclaredField("bulkRequest");
index 3d67412bffeedba1c6e8a66e04bcfdad0924bfd8..1469fb491654bd7814827b5c7faf6c0dfe3ace0d 100644 (file)
@@ -51,7 +51,7 @@ import org.opendaylight.neutron.spi.NeutronBgpvpn;
  */
 
 @Path("/bgpvpns")
-public class NeutronBgpvpnsNorthbound
+public final class NeutronBgpvpnsNorthbound
         extends AbstractNeutronNorthbound<NeutronBgpvpn, NeutronBgpvpnRequest, INeutronBgpvpnCRUD> {
 
     @Context
index 3d1600f636bcc9916048ae0866f5f6c681929957..29c6875918d31e0ea4801bd25c1bca92ae823eae 100644 (file)
@@ -45,7 +45,7 @@ import org.opendaylight.neutron.spi.NeutronFirewall;
  *
  */
 @Path("/fw/firewalls")
-public class NeutronFirewallNorthbound
+public final class NeutronFirewallNorthbound
         extends AbstractNeutronNorthbound<NeutronFirewall, NeutronFirewallRequest, INeutronFirewallCRUD> {
 
     private static final String RESOURCE_NAME = "Firewall";
index 59e58b7d5d46b79d34291add1d5045b8577fac63..0b3e134466c86fabd0e5e54361891789a90ef04d 100644 (file)
@@ -45,7 +45,7 @@ import org.opendaylight.neutron.spi.NeutronFirewallPolicy;
  *
  */
 @Path("/fw/firewall_policies")
-public class NeutronFirewallPolicyNorthbound extends
+public final class NeutronFirewallPolicyNorthbound extends
         AbstractNeutronNorthbound<NeutronFirewallPolicy, NeutronFirewallPolicyRequest, INeutronFirewallPolicyCRUD> {
 
     private static final String RESOURCE_NAME = "Firewall Policy";
index bf76c4b45d3dcce2499a3c9da999b3853a408ad0..724fe12743886283551da7c881d77ace2bae37a1 100644 (file)
@@ -45,7 +45,7 @@ import org.opendaylight.neutron.spi.NeutronFirewallRule;
  */
 
 @Path("fw/firewall_rules")
-public class NeutronFirewallRulesNorthbound
+public final class NeutronFirewallRulesNorthbound
         extends AbstractNeutronNorthbound<NeutronFirewallRule, NeutronFirewallRuleRequest, INeutronFirewallRuleCRUD> {
     private static final String RESOURCE_NAME = "Firewall Rule";
 
index 91d06ff83542db18ad6a5dfcc4a4d27e396debbd..ae6fba384e6aa091c76fff1243f50fbb084a435f 100644 (file)
@@ -47,7 +47,7 @@ import org.opendaylight.neutron.spi.NeutronFloatingIP;
  */
 
 @Path("/floatingips")
-public class NeutronFloatingIPsNorthbound
+public final class NeutronFloatingIPsNorthbound
         extends AbstractNeutronNorthbound<NeutronFloatingIP, NeutronFloatingIPRequest, INeutronFloatingIPCRUD> {
     private static final String RESOURCE_NAME = "Floating IP";
 
index fa63eaa9d65f659f56863fbef2944384d3184e94..1e07e112dc4fb90330043b6a008976a168de6bce 100644 (file)
@@ -20,10 +20,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
 import org.opendaylight.neutron.spi.INeutronL2gatewayConnectionCRUD;
@@ -49,14 +47,11 @@ import org.slf4j.LoggerFactory;
  */
 
 @Path("/l2gateway-connections")
-public class NeutronL2gatewayConnectionNorthbound extends AbstractNeutronNorthbound<NeutronL2gatewayConnection,
+public final class NeutronL2gatewayConnectionNorthbound extends AbstractNeutronNorthbound<NeutronL2gatewayConnection,
         NeutronL2gatewayConnectionRequest, INeutronL2gatewayConnectionCRUD> {
 
     static final Logger logger = LoggerFactory.getLogger(NeutronL2gatewayConnectionNorthbound.class);
 
-    @Context
-    UriInfo uriInfo;
-
     private static final String RESOURCE_NAME = "L2gatewayConnection";
 
     @Override
index 20778c120f03fcf686a2bcecf071af44cbf76335..4b9fc1d0a88b0bf826ea03d1c54fc3dcf328b663 100644 (file)
@@ -20,10 +20,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
 import org.opendaylight.neutron.spi.INeutronL2gatewayCRUD;
@@ -49,13 +47,10 @@ import org.slf4j.LoggerFactory;
  */
 
 @Path("/l2-gateways")
-public class NeutronL2gatewayNorthbound
+public final class NeutronL2gatewayNorthbound
         extends AbstractNeutronNorthbound<NeutronL2gateway, NeutronL2gatewayRequest, INeutronL2gatewayCRUD> {
     static final Logger logger = LoggerFactory.getLogger(NeutronL2gatewayNorthbound.class);
 
-    @Context
-    UriInfo uriInfo;
-
     private static final String RESOURCE_NAME = "L2gateway";
 
     @Override
index c6f40735ccbaef657717479fd0aa338d17c5ae8f..981897d2d23869742dcd926b43449afdc3bf747b 100644 (file)
@@ -46,7 +46,7 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancerHealthMonitor;
  *
  */
 @Path("/lbaas/healthmonitors")
-public class NeutronLoadBalancerHealthMonitorNorthbound
+public final class NeutronLoadBalancerHealthMonitorNorthbound
         extends AbstractNeutronNorthbound<NeutronLoadBalancerHealthMonitor, NeutronLoadBalancerHealthMonitorRequest,
                 INeutronLoadBalancerHealthMonitorCRUD> {
 
index 796b69f1e0798383001a83b5c68c0e0fa13d1b99..70bcde6b793ea060247633bc1ec76517b111f7b0 100644 (file)
@@ -46,7 +46,7 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancerListener;
  *
  */
 @Path("/lbaas/listeners")
-public class NeutronLoadBalancerListenerNorthbound extends AbstractNeutronNorthbound<NeutronLoadBalancerListener,
+public final class NeutronLoadBalancerListenerNorthbound extends AbstractNeutronNorthbound<NeutronLoadBalancerListener,
         NeutronLoadBalancerListenerRequest, INeutronLoadBalancerListenerCRUD> {
 
     private static final String RESOURCE_NAME = "LoadBalancerListener";
index 888f423a728fb87d25602ec63e247ec2864af9cb..7c1b3427bc7a31503b457969c40891cc5b03f89a 100644 (file)
@@ -46,7 +46,7 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancer;
  *
  */
 @Path("/lbaas/loadbalancers")
-public class NeutronLoadBalancerNorthbound
+public final class NeutronLoadBalancerNorthbound
         extends AbstractNeutronNorthbound<NeutronLoadBalancer, NeutronLoadBalancerRequest, INeutronLoadBalancerCRUD> {
 
     private static final String RESOURCE_NAME = "LoadBalancer";
index 1e6ea6518919fc00e70fadbf1672fd7371a1e31b..b960b57f5d5091942a9b4b9b8dae5947faf79543 100644 (file)
@@ -53,7 +53,7 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember;
  */
 
 @Path("/lbaas/pools")
-public class NeutronLoadBalancerPoolNorthbound extends AbstractNeutronNorthbound<NeutronLoadBalancerPool,
+public final class NeutronLoadBalancerPoolNorthbound extends AbstractNeutronNorthbound<NeutronLoadBalancerPool,
         NeutronLoadBalancerPoolRequest, INeutronLoadBalancerPoolCRUD> {
 
     private static final String RESOURCE_NAME = "LoadBalancerPool";
index 82e345b984858f0f63ad94bc47669e1201c7dcdc..1a9299063d20788b8359bf1cf9216aaa2874607e 100644 (file)
@@ -20,10 +20,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
 import org.opendaylight.neutron.spi.INeutronMeteringLabelRuleCRUD;
@@ -48,7 +46,7 @@ import org.opendaylight.neutron.spi.NeutronMeteringLabelRule;
  */
 
 @Path("/metering/metering-label-rules")
-public class NeutronMeteringLabelRulesNorthbound extends AbstractNeutronNorthbound<NeutronMeteringLabelRule,
+public final class NeutronMeteringLabelRulesNorthbound extends AbstractNeutronNorthbound<NeutronMeteringLabelRule,
         NeutronMeteringLabelRuleRequest, INeutronMeteringLabelRuleCRUD> {
     private static final String RESOURCE_NAME = "Metering Label Rule";
 
@@ -57,9 +55,6 @@ public class NeutronMeteringLabelRulesNorthbound extends AbstractNeutronNorthbou
         return RESOURCE_NAME;
     }
 
-    @Context
-    UriInfo uriInfo;
-
     /**
      * Returns a list of all metering label rules */
 
index 0cf46f2b69cebf74ccad4cd2a57a770abe7abc32..a5809cc145b7dadfdca9271fb5d92a5328829a20 100644 (file)
@@ -20,10 +20,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
 import org.opendaylight.neutron.spi.INeutronMeteringLabelCRUD;
@@ -48,7 +46,7 @@ import org.opendaylight.neutron.spi.NeutronMeteringLabel;
  */
 
 @Path("/metering/metering-labels")
-public class NeutronMeteringLabelsNorthbound extends
+public final class NeutronMeteringLabelsNorthbound extends
         AbstractNeutronNorthbound<NeutronMeteringLabel, NeutronMeteringLabelRequest, INeutronMeteringLabelCRUD> {
     private static final String RESOURCE_NAME = "Metering Label";
 
@@ -57,9 +55,6 @@ public class NeutronMeteringLabelsNorthbound extends
         return RESOURCE_NAME;
     }
 
-    @Context
-    UriInfo uriInfo;
-
     /**
      * Returns a list of all metering labels */
 
index d11aa5e940bdebcb1d5dd278d4888df06fb5faaa..ed8f296b0a65af2711621cb0d67483c0a21f7c6e 100644 (file)
@@ -51,7 +51,7 @@ import org.opendaylight.neutron.spi.NeutronNetwork;
  */
 
 @Path("/networks")
-public class NeutronNetworksNorthbound
+public final class NeutronNetworksNorthbound
         extends AbstractNeutronNorthbound<NeutronNetwork, NeutronNetworkRequest, INeutronNetworkCRUD> {
 
     @Context
index 0cc0dae0fde7f3209a1084f01a751b2da14950b4..74ac72600d36bd54e22d22574b8ecab5eba24943 100644 (file)
@@ -21,7 +21,7 @@ import org.eclipse.persistence.jaxb.rs.MOXyJsonProvider;
  * because package scanning in jersey doesn't yet work in OSGi environment.
  *
  */
-public class NeutronNorthboundRSApplication extends Application {
+public final class NeutronNorthboundRSApplication extends Application {
     private static final int HASHMAP_SIZE = 3;
 
     @Override
index 6e20a55767590fc3950999c9e80e2d4059ef216b..5a8d0b7a2be0fe8a914da83072ef1b4ede6eb8dd 100644 (file)
@@ -15,8 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-
-public class NeutronPageLink {
+public final class NeutronPageLink {
 
     @XmlElement(name = "ref")
     String ref;
index 8500145f039f337cf0b2a1958102cce4c744d6fd..3fd71c768f9c617dcda54317e58fa756d6b34b62 100644 (file)
@@ -51,7 +51,7 @@ import org.opendaylight.neutron.spi.NeutronPort;
  */
 
 @Path("/ports")
-public class NeutronPortsNorthbound
+public final class NeutronPortsNorthbound
         extends AbstractNeutronNorthbound<NeutronPort, NeutronPortRequest, INeutronPortCRUD> {
 
     private static final String RESOURCE_NAME = "Port";
index a9f1254005cebe073b85286f249ef435bb261bb3..39f3151d9653c1633cf24938a7df543694eed730 100644 (file)
@@ -28,7 +28,7 @@ import org.opendaylight.neutron.spi.INeutronQosPolicyCRUD;
 import org.opendaylight.neutron.spi.NeutronQosPolicy;
 
 @Path("/qos/policies")
-public class NeutronQosPolicyNorthbound
+public final class NeutronQosPolicyNorthbound
         extends AbstractNeutronNorthbound<NeutronQosPolicy, NeutronQosPolicyRequest, INeutronQosPolicyCRUD> {
 
     private static final String RESOURCE_NAME = "Qos Policy";
index b9c51d6225a5affded533460eb31d4321a0dcb71..60264b4dedcf0af271640149804810fc2eb19af2 100644 (file)
@@ -49,7 +49,7 @@ import org.opendaylight.neutron.spi.NeutronRouter_Interface;
  */
 
 @Path("/routers")
-public class NeutronRoutersNorthbound
+public final class NeutronRoutersNorthbound
         extends AbstractNeutronNorthbound<NeutronRouter, NeutronRouterRequest, INeutronRouterCRUD> {
     static final String ROUTER_INTERFACE_STR = "network:router_interface";
     static final String ROUTER_GATEWAY_STR = "network:router_gateway";
index 312d2db5f4ef43bd0db25ca0b9cacb23506f7852..f52cdf2601a3d003491c40fcda0fce8ae3c15878 100644 (file)
@@ -46,7 +46,7 @@ import org.opendaylight.neutron.spi.NeutronSFCFlowClassifier;
  */
 
 @Path("/sfc/flowclassifiers")
-public class NeutronSFCFlowClassifiersNorthbound extends AbstractNeutronNorthbound<NeutronSFCFlowClassifier,
+public final class NeutronSFCFlowClassifiersNorthbound extends AbstractNeutronNorthbound<NeutronSFCFlowClassifier,
         NeutronSFCFlowClassifierRequest, INeutronSFCFlowClassifierCRUD> {
     private static final String RESOURCE_NAME = "Sfc Flow Classifier";
 
index 1c4b8d2ce619660e0f61fd1eff969f4e09d478f1..840312206aa888245207b6de6ac4d5fad62327bb 100644 (file)
@@ -46,7 +46,7 @@ import org.opendaylight.neutron.spi.NeutronSFCPortChain;
  */
 
 @Path("/sfc/portchains")
-public class NeutronSFCPortChainsNorthbound
+public final class NeutronSFCPortChainsNorthbound
         extends AbstractNeutronNorthbound<NeutronSFCPortChain, NeutronSFCPortChainRequest, INeutronSFCPortChainCRUD> {
 
     private static final String RESOURCE_NAME = "Sfc Port Chain";
index a46ed01f7d8a1412c43a3387c52f91dd562ec7e4..3ca30aa05693c8aa24b5909b5af1831dc4ec1676 100644 (file)
@@ -46,7 +46,7 @@ import org.opendaylight.neutron.spi.NeutronSFCPortPairGroup;
  */
 
 @Path("/sfc/portpairgroups")
-public class NeutronSFCPortPairGroupsNorthbound extends AbstractNeutronNorthbound<NeutronSFCPortPairGroup,
+public final class NeutronSFCPortPairGroupsNorthbound extends AbstractNeutronNorthbound<NeutronSFCPortPairGroup,
         NeutronSFCPortPairGroupRequest, INeutronSFCPortPairGroupCRUD> {
 
     private static final String RESOURCE_NAME = "Sfc Port Pair Group";
index 3e933240ebf9d93025e894da7a605e97d2fcbd80..18d103c4993c3e3561710a6eae4e5a0bfb0eaf34 100644 (file)
@@ -46,7 +46,7 @@ import org.opendaylight.neutron.spi.NeutronSFCPortPair;
  */
 
 @Path("/sfc/portpairs")
-public class NeutronSFCPortPairsNorthbound
+public final class NeutronSFCPortPairsNorthbound
         extends AbstractNeutronNorthbound<NeutronSFCPortPair, NeutronSFCPortPairRequest, INeutronSFCPortPairCRUD> {
 
     private static final String RESOURCE_NAME = "Sfc Port Pair";
index 5a0906ae94563196ae3318c280cca42ed4c9244e..399a2097a0edae7485bb47fd94b08df132cb50f6 100644 (file)
@@ -45,7 +45,7 @@ import org.opendaylight.neutron.spi.NeutronSecurityGroup;
  * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration
  */
 @Path("/security-groups")
-public class NeutronSecurityGroupsNorthbound extends
+public final class NeutronSecurityGroupsNorthbound extends
         AbstractNeutronNorthbound<NeutronSecurityGroup, NeutronSecurityGroupRequest, INeutronSecurityGroupCRUD> {
     private static final String RESOURCE_NAME = "Security Group";
 
index 2cca389c7763097a2abe9edcbc52c8ea6ced367e..fabaf962f3b761f7a84561636f8e073ec51b5ca6 100644 (file)
@@ -46,7 +46,7 @@ import org.opendaylight.neutron.spi.NeutronSecurityRule;
  */
 
 @Path("/security-group-rules")
-public class NeutronSecurityRulesNorthbound
+public final class NeutronSecurityRulesNorthbound
         extends AbstractNeutronNorthbound<NeutronSecurityRule, NeutronSecurityRuleRequest, INeutronSecurityRuleCRUD> {
     private static final String RESOURCE_NAME = "Security Rule";
 
index 649a461cc269eb76c46497faa5a32fb70de25407..561c4ca10470c75530b20e82360a7e22e84f1120 100644 (file)
@@ -51,7 +51,7 @@ import org.opendaylight.neutron.spi.NeutronSubnet;
  */
 
 @Path("/subnets")
-public class NeutronSubnetsNorthbound
+public final class NeutronSubnetsNorthbound
         extends AbstractNeutronNorthbound<NeutronSubnet, NeutronSubnetRequest, INeutronSubnetCRUD> {
     private static final String RESOURCE_NAME = "Subnet";
 
index 8e629af9c36c27d6cdf8ee72252efaf6850f6e2b..db0d60d510b4fc5a6993c0eb3f6ca84ab842b3ba 100644 (file)
@@ -21,10 +21,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
 import org.codehaus.enunciate.jaxrs.TypeHint;
@@ -50,7 +48,7 @@ import org.opendaylight.neutron.spi.NeutronVPNIKEPolicy;
  */
 
 @Path("/vpn/ikepolicies")
-public class NeutronVPNIKEPoliciesNorthbound
+public final class NeutronVPNIKEPoliciesNorthbound
         extends AbstractNeutronNorthbound<NeutronVPNIKEPolicy, NeutronVPNIKEPolicyRequest, INeutronVPNIKEPolicyCRUD> {
     private static final String RESOURCE_NAME = "VPNIKEPolicy";
 
@@ -59,9 +57,6 @@ public class NeutronVPNIKEPoliciesNorthbound
         return RESOURCE_NAME;
     }
 
-    @Context
-    UriInfo uriInfo;
-
     /**
      * Returns a list of all VPN IKE Policies */
 
index 65842b95ee9d8354b1290a70fb28cc15a48d2db8..784a637eeec5b5f0bc4aebe26161de737d75761f 100644 (file)
@@ -21,10 +21,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
 import org.codehaus.enunciate.jaxrs.TypeHint;
@@ -50,7 +48,7 @@ import org.opendaylight.neutron.spi.NeutronVPNIPSECPolicy;
  */
 
 @Path("/vpn/ipsecpolicies")
-public class NeutronVPNIPSECPoliciesNorthbound extends
+public final class NeutronVPNIPSECPoliciesNorthbound extends
         AbstractNeutronNorthbound<NeutronVPNIPSECPolicy, NeutronVPNIPSECPolicyRequest, INeutronVPNIPSECPolicyCRUD> {
 
     private static final String RESOURCE_NAME = "VPNIPSECPolicy";
@@ -60,9 +58,6 @@ public class NeutronVPNIPSECPoliciesNorthbound extends
         return RESOURCE_NAME;
     }
 
-    @Context
-    UriInfo uriInfo;
-
     /**
      * Returns a list of all VPN IPSEC Policies */
 
index eca5524f9395c2240bd72ac85f92b3f63868ff54..2497f13ce3e03a27f8d5bdeb045db2af0d402d8b 100644 (file)
@@ -21,10 +21,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
 import org.codehaus.enunciate.jaxrs.TypeHint;
@@ -50,7 +48,8 @@ import org.opendaylight.neutron.spi.NeutronVPNIPSECSiteConnection;
  */
 
 @Path("/vpn/ipsecsiteconnections")
-public class NeutronVPNIPSECSiteConnectionsNorthbound extends AbstractNeutronNorthbound<NeutronVPNIPSECSiteConnection,
+public final class NeutronVPNIPSECSiteConnectionsNorthbound
+        extends AbstractNeutronNorthbound<NeutronVPNIPSECSiteConnection,
         NeutronVPNIPSECSiteConnectionRequest, INeutronVPNIPSECSiteConnectionsCRUD> {
 
     private static final String RESOURCE_NAME = "VPNIPSECSiteConnections";
@@ -60,9 +59,6 @@ public class NeutronVPNIPSECSiteConnectionsNorthbound extends AbstractNeutronNor
         return RESOURCE_NAME;
     }
 
-    @Context
-    UriInfo uriInfo;
-
     /**
      * Returns a list of all VPN IPSEC SiteConnections
      */
index 2859b23a134778121ca257b269b5fe6ae47f409b..82f983ce156d4bc7e225c357584ea994d59a4010 100644 (file)
@@ -21,10 +21,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
 import org.codehaus.enunciate.jaxrs.TypeHint;
@@ -50,7 +48,7 @@ import org.opendaylight.neutron.spi.NeutronVPNService;
  */
 
 @Path("/vpn/vpnservices")
-public class NeutronVPNServicesNorthbound
+public final class NeutronVPNServicesNorthbound
         extends AbstractNeutronNorthbound<NeutronVPNService, NeutronVPNServiceRequest, INeutronVPNServiceCRUD> {
 
     private static final String RESOURCE_NAME = "VPNService";
@@ -60,9 +58,6 @@ public class NeutronVPNServicesNorthbound
         return RESOURCE_NAME;
     }
 
-    @Context
-    UriInfo uriInfo;
-
     /**
      * Returns a list of all VPN Services
      */
index 2952b2903f60482010459dee419efcbecfa968a3..2f2572a0fdc9948479835267a3f76ebcffa97382 100644 (file)
@@ -59,7 +59,7 @@ public final class PaginatedRequestFactory {
 
         @Override
         public MarkerObject extractFields(List<String> fields) {
-            return null;
+            throw new UnsupportedOperationException("extractFields shouldn't be called for MarkerObject");
         }
     }