From 62672557e49d8c29b5552a4b87d7e6ca99062983 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Mon, 8 Oct 2018 23:59:37 +0200 Subject: [PATCH] improve error logs due to IllegalArgumentException to include full input This requires, and adds, a working toString() for all *Request classes, which is always useful for future logging of requests elsewhere. This introduction of a NeutronRequest (an ABC instead of an interface) could in the future also allow a follow-up change to get rid of the reflection in INeutronRequest, by having a (generic) "singleton" and a "bulkRequest" field in NeutronRequest instead of in each *Request class. (The problem with that idea, and why it is how it currently is, are the @XmlElement annotations for singleton and bulkRequest in each *Request; those would have to be moved to new getters.) Change-Id: I9769a3825632dd2bd2f9e2875b91d06a4f781616 Signed-off-by: Michael Vorburger --- .../neutron/e2etest/HttpUtils.java | 2 +- .../api/AbstractNeutronNorthbound.java | 2 ++ .../northbound/api/NeutronBgpvpnRequest.java | 2 +- .../api/NeutronFirewallPolicyRequest.java | 2 +- .../api/NeutronFirewallRequest.java | 2 +- .../api/NeutronFirewallRuleRequest.java | 2 +- .../api/NeutronFloatingIpRequest.java | 2 +- .../NeutronL2gatewayConnectionRequest.java | 2 +- .../api/NeutronL2gatewayRequest.java | 2 +- ...utronLoadBalancerHealthMonitorRequest.java | 2 +- .../NeutronLoadBalancerListenerRequest.java | 2 +- .../NeutronLoadBalancerPoolMemberRequest.java | 2 +- .../api/NeutronLoadBalancerPoolRequest.java | 2 +- .../api/NeutronLoadBalancerRequest.java | 2 +- .../api/NeutronMeteringLabelRequest.java | 2 +- .../api/NeutronMeteringLabelRuleRequest.java | 2 +- .../northbound/api/NeutronNetworkRequest.java | 2 +- .../northbound/api/NeutronPortRequest.java | 2 +- .../api/NeutronQosPolicyRequest.java | 2 +- .../northbound/api/NeutronRequest.java | 31 +++++++++++++++++++ .../northbound/api/NeutronRouterRequest.java | 2 +- .../api/NeutronSFCFlowClassifierRequest.java | 2 +- .../api/NeutronSFCPortChainRequest.java | 2 +- .../api/NeutronSFCPortPairGroupRequest.java | 2 +- .../api/NeutronSFCPortPairRequest.java | 2 +- .../api/NeutronSecurityGroupRequest.java | 2 +- .../api/NeutronSecurityRuleRequest.java | 2 +- .../northbound/api/NeutronSubnetRequest.java | 2 +- .../northbound/api/NeutronTapFlowRequest.java | 2 +- .../api/NeutronTapServiceRequest.java | 2 +- .../northbound/api/NeutronTrunkRequest.java | 2 +- .../api/NeutronVpnIkePolicyRequest.java | 2 +- .../api/NeutronVpnIpSecPolicyRequest.java | 2 +- .../NeutronVpnIpSecSiteConnectionRequest.java | 2 +- .../api/NeutronVpnServiceRequest.java | 2 +- 35 files changed, 66 insertions(+), 33 deletions(-) create mode 100644 northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRequest.java diff --git a/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/HttpUtils.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/HttpUtils.java index bee5779e1..206e5b89e 100644 --- a/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/HttpUtils.java +++ b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/HttpUtils.java @@ -150,7 +150,7 @@ public final class HttpUtils { Assert.assertTrue("E2E Tests Failed - Json Error", entrySet.size() > 0); JsonElement jsonElementValue = entrySet.iterator().next().getValue(); String key = entrySet.iterator().next().getKey(); - Assert.assertEquals(context, collectionName, key); + Assert.assertEquals(context + "; jsonObjectOutput=" + jsonObjectOutput.toString(), collectionName, key); Assert.assertTrue("E2E Tests Failed - Collection not Array: " + jsonElementValue + "; URL: " + urlStr + "; full response: " + response, jsonElementValue.isJsonArray()); JsonArray jsonArray = jsonElementValue.getAsJsonArray(); diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/AbstractNeutronNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/AbstractNeutronNorthbound.java index b03a2fa48..de64b76de 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/AbstractNeutronNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/AbstractNeutronNorthbound.java @@ -144,6 +144,8 @@ public abstract class AbstractNeutronNorthbound, R e } catch (OperationFailedException e) { LOG.warn("create failed due to datastore problem (possibly missing required fields); input: {}", input); throw new DatastoreOperationFailedWebApplicationException(e); + } catch (IllegalArgumentException e) { + throw new IllegalArgumentException("IAE for input: " + input.toString(), e); } } diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronBgpvpnRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronBgpvpnRequest.java index 46601b106..504061a5b 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronBgpvpnRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronBgpvpnRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronBgpvpn; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronBgpvpnRequest implements INeutronRequest { +public final class NeutronBgpvpnRequest extends NeutronRequest { // See OpenStack Network API v2.0 Reference for description of // annotated attributes diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyRequest.java index b971c7a4b..677a2708d 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronFirewallPolicy; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronFirewallPolicyRequest implements INeutronRequest { +public final class NeutronFirewallPolicyRequest extends NeutronRequest { /** * See OpenStack Network API v2.0 Reference for description of the following link. * http://docs.openstack.org/api/openstack-network/2.0/content/ diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRequest.java index 35bb0b528..088bc307e 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronFirewall; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronFirewallRequest implements INeutronRequest { +public final class NeutronFirewallRequest extends NeutronRequest { /** * See OpenStack Network API v2.0 Reference for description of the following link. * http://docs.openstack.org/api/openstack-network/2.0/content/ diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRuleRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRuleRequest.java index c5bab0b37..59cbbc45a 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRuleRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRuleRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronFirewallRule; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronFirewallRuleRequest implements INeutronRequest { +public final class NeutronFirewallRuleRequest extends NeutronRequest { /** * See OpenStack Network API v2.0 Reference for description of the following link. * http://docs.openstack.org/api/openstack-network/2.0/content/ diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIpRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIpRequest.java index 9487703d9..b64f2f6f4 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIpRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIpRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronFloatingIp; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronFloatingIpRequest implements INeutronRequest { +public final class NeutronFloatingIpRequest extends NeutronRequest { // See OpenStack Network API v2.0 Reference for description of // annotated attributes diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayConnectionRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayConnectionRequest.java index 74552472c..0c015b375 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayConnectionRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayConnectionRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronL2gatewayConnection; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronL2gatewayConnectionRequest implements INeutronRequest { +public final class NeutronL2gatewayConnectionRequest extends NeutronRequest { @XmlElement(name = "l2gateway_connection") NeutronL2gatewayConnection singleton; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayRequest.java index d568ad4ba..60be6c91c 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayRequest.java @@ -14,7 +14,7 @@ import javax.xml.bind.annotation.XmlElement; import org.opendaylight.neutron.spi.NeutronL2gateway; @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronL2gatewayRequest implements INeutronRequest { +public final class NeutronL2gatewayRequest extends NeutronRequest { @XmlElement(name = "l2_gateway") NeutronL2gateway singleton; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorRequest.java index a23c74e40..1983a9169 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorRequest.java @@ -20,7 +20,7 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancerHealthMonitor; @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") public final class NeutronLoadBalancerHealthMonitorRequest - implements INeutronRequest { + extends NeutronRequest { /** * See OpenStack Network API v2.0 Reference for description of the following link. * http://docs.openstack.org/api/openstack-network/2.0/content/ diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerRequest.java index 47756c27a..5590d2d40 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancerListener; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronLoadBalancerListenerRequest implements INeutronRequest { +public final class NeutronLoadBalancerListenerRequest extends NeutronRequest { /** * See OpenStack Network API v2.0 Reference for description of the following link. * http://docs.openstack.org/api/openstack-network/2.0/content/ diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMemberRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMemberRequest.java index f9724cd43..88dcc6942 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMemberRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMemberRequest.java @@ -14,7 +14,7 @@ import javax.xml.bind.annotation.XmlElement; import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember; @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronLoadBalancerPoolMemberRequest implements INeutronRequest { +public final class NeutronLoadBalancerPoolMemberRequest extends NeutronRequest { /** * See OpenStack Network API v2.0 Reference for description of the following link. * http://docs.openstack.org/api/openstack-network/2.0/content/ diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolRequest.java index 2bfd997b6..655966ec0 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancerPool; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronLoadBalancerPoolRequest implements INeutronRequest { +public final class NeutronLoadBalancerPoolRequest extends NeutronRequest { /** * See OpenStack Network API v2.0 Reference for description of the following link. * http://docs.openstack.org/api/openstack-network/2.0/content/ diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerRequest.java index 1df94a654..fbe26049f 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancer; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronLoadBalancerRequest implements INeutronRequest { +public final class NeutronLoadBalancerRequest extends NeutronRequest { /** * See OpenStack Network API v2.0 Reference for description of the following link. * http://docs.openstack.org/api/openstack-network/2.0/content/ diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRequest.java index 750bf5d63..1f082ff17 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronMeteringLabel; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronMeteringLabelRequest implements INeutronRequest { +public final class NeutronMeteringLabelRequest extends NeutronRequest { // See OpenStack Network API v2.0 Reference for description of // annotated attributes diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRuleRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRuleRequest.java index 42a104601..e355af61a 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRuleRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRuleRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronMeteringLabelRule; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronMeteringLabelRuleRequest implements INeutronRequest { +public final class NeutronMeteringLabelRuleRequest extends NeutronRequest { // See OpenStack Network API v2.0 Reference for description of // annotated attributes diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworkRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworkRequest.java index 83578c39d..54c51e506 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworkRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworkRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronNetwork; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronNetworkRequest implements INeutronRequest { +public final class NeutronNetworkRequest extends NeutronRequest { // See OpenStack Network API v2.0 Reference for description of // annotated attributes diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortRequest.java index c891c34ae..e9b2c8ea7 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronPort; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronPortRequest implements INeutronRequest { +public final class NeutronPortRequest extends NeutronRequest { // See OpenStack Network API v2.0 Reference for description of // annotated attributes diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronQosPolicyRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronQosPolicyRequest.java index 1d270e454..5d5866c51 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronQosPolicyRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronQosPolicyRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronQosPolicy; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronQosPolicyRequest implements INeutronRequest { +public final class NeutronQosPolicyRequest extends NeutronRequest { @XmlElement(name = "policy") NeutronQosPolicy singleton; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRequest.java new file mode 100644 index 000000000..7db0f2495 --- /dev/null +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRequest.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * 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.neutron.northbound.api; + +import javax.xml.bind.annotation.XmlTransient; +import org.opendaylight.neutron.spi.INeutronObject; + +/** + * Abstract base class a correct {@link #toString()} for all {@link INeutronRequest} implementations. + * + * @author Michael Vorburger.ch + */ +@XmlTransient +public abstract class NeutronRequest> implements INeutronRequest { + + // TODO move the singleton & bulkRequest fields from the subclasses up into this class + + @Override + public String toString() { + T singleton = getSingleton(); + return getClass().getSimpleName() + "{" + + singleton != null ? "singleton=" + singleton + : "bulkRequest=" + getBulk() + + "}"; + } +} diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRouterRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRouterRequest.java index 4a07cad16..492981b7b 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRouterRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRouterRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronRouter; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronRouterRequest implements INeutronRequest { +public final class NeutronRouterRequest extends NeutronRequest { // See OpenStack Network API v2.0 Reference for description of // annotated attributes diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCFlowClassifierRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCFlowClassifierRequest.java index 865b5c6ae..32c2e9fa6 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCFlowClassifierRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCFlowClassifierRequest.java @@ -18,7 +18,7 @@ import org.opendaylight.neutron.spi.NeutronSFCFlowClassifier; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronSFCFlowClassifierRequest implements INeutronRequest { +public final class NeutronSFCFlowClassifierRequest extends NeutronRequest { // See OpenStack Networking SFC (networking-sfc) API v1.0 Reference for description of // annotated attributes diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortChainRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortChainRequest.java index 5a6eba03e..fe6951ec7 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortChainRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortChainRequest.java @@ -18,7 +18,7 @@ import org.opendaylight.neutron.spi.NeutronSFCPortChain; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronSFCPortChainRequest implements INeutronRequest { +public final class NeutronSFCPortChainRequest extends NeutronRequest { // See OpenStack Networking SFC (networking-sfc) Port Chain API v1.0 Reference // for description of annotated attributes diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairGroupRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairGroupRequest.java index d54cecb99..130232bb0 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairGroupRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairGroupRequest.java @@ -18,7 +18,7 @@ import org.opendaylight.neutron.spi.NeutronSFCPortPairGroup; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronSFCPortPairGroupRequest implements INeutronRequest { +public final class NeutronSFCPortPairGroupRequest extends NeutronRequest { // See OpenStack Networking SFC (networking-sfc) Port Pair Group API v1.0 Reference // for description of annotated attributes diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairRequest.java index 30382fd85..3e8d8c3dd 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairRequest.java @@ -18,7 +18,7 @@ import org.opendaylight.neutron.spi.NeutronSFCPortPair; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronSFCPortPairRequest implements INeutronRequest { +public final class NeutronSFCPortPairRequest extends NeutronRequest { // See OpenStack Networking SFC (networking-sfc) Port Pair API v1.0 Reference // for description of annotated attributes diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java index cb5c9b3f6..1cde5e302 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java @@ -18,7 +18,7 @@ import org.opendaylight.neutron.spi.NeutronSecurityGroup; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronSecurityGroupRequest implements INeutronRequest { +public final class NeutronSecurityGroupRequest extends NeutronRequest { /** * See OpenStack Network API v2.0 Reference for a diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java index dff94cd4f..25964b56f 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java @@ -18,7 +18,7 @@ import org.opendaylight.neutron.spi.NeutronSecurityRule; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronSecurityRuleRequest implements INeutronRequest { +public final class NeutronSecurityRuleRequest extends NeutronRequest { /** * See OpenStack Network API v2.0 Reference for a diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetRequest.java index aebf5454b..0c4b11c7d 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronSubnet; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronSubnetRequest implements INeutronRequest { +public final class NeutronSubnetRequest extends NeutronRequest { // See OpenStack Network API v2.0 Reference for description of // annotated attributes diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapFlowRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapFlowRequest.java index b09e1e97e..fd418e61b 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapFlowRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapFlowRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronTapFlow; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronTapFlowRequest implements INeutronRequest { +public final class NeutronTapFlowRequest extends NeutronRequest { @XmlElement(name = "tap_flow") NeutronTapFlow singleton; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapServiceRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapServiceRequest.java index 983352932..bf5305dce 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapServiceRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapServiceRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronTapService; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronTapServiceRequest implements INeutronRequest { +public final class NeutronTapServiceRequest extends NeutronRequest { @XmlElement(name = "tap_service") NeutronTapService singleton; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTrunkRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTrunkRequest.java index 4e925eb31..fd117bffd 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTrunkRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTrunkRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronTrunk; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronTrunkRequest implements INeutronRequest { +public final class NeutronTrunkRequest extends NeutronRequest { @XmlElement(name = "trunk") NeutronTrunk singleton; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIkePolicyRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIkePolicyRequest.java index e46a368e0..2224d2390 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIkePolicyRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIkePolicyRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronVpnIkePolicy; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronVpnIkePolicyRequest implements INeutronRequest { +public final class NeutronVpnIkePolicyRequest extends NeutronRequest { @XmlElement(name = "ikepolicy") NeutronVpnIkePolicy singleton; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecPolicyRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecPolicyRequest.java index 07fafda9f..1295f9b48 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecPolicyRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecPolicyRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronVpnIpSecPolicy; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronVpnIpSecPolicyRequest implements INeutronRequest { +public final class NeutronVpnIpSecPolicyRequest extends NeutronRequest { @XmlElement(name = "ipsecpolicy") NeutronVpnIpSecPolicy singleton; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecSiteConnectionRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecSiteConnectionRequest.java index a2337bc60..d62519f0e 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecSiteConnectionRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecSiteConnectionRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronVpnIpSecSiteConnection; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronVpnIpSecSiteConnectionRequest implements INeutronRequest { +public final class NeutronVpnIpSecSiteConnectionRequest extends NeutronRequest { @XmlElement(name = "ipsec_site_connection") NeutronVpnIpSecSiteConnection singleton; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnServiceRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnServiceRequest.java index 374a6d44e..63ec9bc62 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnServiceRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnServiceRequest.java @@ -19,7 +19,7 @@ import org.opendaylight.neutron.spi.NeutronVpnService; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") -public final class NeutronVpnServiceRequest implements INeutronRequest { +public final class NeutronVpnServiceRequest extends NeutronRequest { @XmlElement(name = "vpnservice") NeutronVpnService singleton; -- 2.36.6