Checkstyle formatting issues fix (SPI)

[neutron.git] / neutron-spi / src / main / java / org / opendaylight / neutron / spi / NeutronFirewallRule.java

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
index 6abcfc3f8d4e88367709cfa202b16d30d2dbe213..645db26d0602cd427c9b1eda698c7284ebeeeb14 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
@@ -8,13 +8,13 @@
 
 package org.opendaylight.neutron.spi;
 
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * OpenStack Neutron v2.0 Firewall as a service
@@ -24,17 +24,17 @@ import java.util.List;
  *
  * tenant_id               uuid-str
  * name                    String
- * description             String
  * admin_state_up          Bool
- * status                  String
  * shared                  Bool
  * firewall_policy_id      uuid-str
  * protocol                String
  * ip_version              Integer
  * source_ip_address       String (IP addr or CIDR)
  * destination_ip_address  String (IP addr or CIDR)
- * source_port             Integer
- * destination_port        Integer
+ * source_port_range_min    Integer
+ * source_port_range_max    Integer
+ * destination_port_range_min Integer
+ * destination_port_range_max Integer
  * position                Integer
  * action                  String
  * enabled                 Bool
@@ -46,24 +46,12 @@ import java.util.List;
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 
-public class NeutronFirewallRule implements Serializable, INeutronObject {
+public class NeutronFirewallRule extends NeutronObject implements Serializable, INeutronObject {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(name = "id")
-    String firewallRuleUUID;
-
-    @XmlElement(name = "tenant_id")
-    String firewallRuleTenantID;
-
     @XmlElement(name = "name")
     String firewallRuleName;
 
-    @XmlElement(name = "description")
-    String firewallRuleDescription;
-
-    @XmlElement(name = "status")
-    String firewallRuleStatus;
-
     @XmlElement(defaultValue = "false", name = "shared")
     Boolean firewallRuleIsShared;
 
@@ -82,11 +70,17 @@ public class NeutronFirewallRule implements Serializable, INeutronObject {
     @XmlElement(name = "destination_ip_address")
     String firewallRuleDstIpAddr;
 
-    @XmlElement(name = "source_port")
-    Integer firewallRuleSrcPort;
+    @XmlElement(name = "source_port_range_min")
+    Integer firewallRuleSrcPortRangeMin;
+
+    @XmlElement(name = "source_port_range_max")
+    Integer firewallRuleSrcPortRangeMax;
+
+    @XmlElement(name = "destination_port_range_min")
+    Integer firewallRuleDstPortRangeMin;
 
-    @XmlElement(name = "destination_port")
-    Integer firewallRuleDstPort;
+    @XmlElement(name = "destination_port_range_max")
+    Integer firewallRuleDstPortRangeMax;
 
     @XmlElement(name = "position")
     Integer firewallRulePosition;
@@ -121,20 +115,36 @@ public class NeutronFirewallRule implements Serializable, INeutronObject {
         this.firewallRulePosition = firewallRulePosition;
     }
 
-    public Integer getFirewallRuleDstPort() {
-        return firewallRuleDstPort;
+    public Integer getFirewallRuleDstPortRangeMin() {
+        return firewallRuleDstPortRangeMin;
     }
 
-    public void setFirewallRuleDstPort(Integer firewallRuleDstPort) {
-        this.firewallRuleDstPort = firewallRuleDstPort;
+    public void setFirewallRuleDstPortRangeMin(Integer firewallRuleDstPortRangeMin) {
+        this.firewallRuleDstPortRangeMin = firewallRuleDstPortRangeMin;
     }
 
-    public Integer getFirewallRuleSrcPort() {
-        return firewallRuleSrcPort;
+    public Integer getFirewallRuleDstPortRangeMax() {
+        return firewallRuleDstPortRangeMax;
     }
 
-    public void setFirewallRuleSrcPort(Integer firewallRuleSrcPort) {
-        this.firewallRuleSrcPort = firewallRuleSrcPort;
+    public void setFirewallRuleDstPortRangeMax(Integer firewallRuleDstPortRangeMax) {
+        this.firewallRuleDstPortRangeMax = firewallRuleDstPortRangeMax;
+    }
+
+    public Integer getFirewallRuleSrcPortRangeMin() {
+        return firewallRuleSrcPortRangeMin;
+    }
+
+    public void setFirewallRuleSrcPortRangeMin(Integer firewallRuleSrcPortRangeMin) {
+        this.firewallRuleSrcPortRangeMin = firewallRuleSrcPortRangeMin;
+    }
+
+    public Integer getFirewallRuleSrcPortRangeMax() {
+        return firewallRuleSrcPortRangeMax;
+    }
+
+    public void setFirewallRuleSrcPortRangeMax(Integer firewallRuleSrcPortRangeMax) {
+        this.firewallRuleSrcPortRangeMax = firewallRuleSrcPortRangeMax;
     }
 
     public String getFirewallRuleDstIpAddr() {
@@ -185,22 +195,6 @@ public class NeutronFirewallRule implements Serializable, INeutronObject {
         this.firewallRuleIsShared = firewallRuleIsShared;
     }
 
-    public String getFirewallRuleStatus() {
-        return firewallRuleStatus;
-    }
-
-    public void setFirewallRuleStatus(String firewallRuleStatus) {
-        this.firewallRuleStatus = firewallRuleStatus;
-    }
-
-    public String getFirewallRuleDescription() {
-        return firewallRuleDescription;
-    }
-
-    public void setFirewallRuleDescription(String firewallRuleDescription) {
-        this.firewallRuleDescription = firewallRuleDescription;
-    }
-
     public String getFirewallRuleName() {
         return firewallRuleName;
     }
@@ -209,32 +203,6 @@ public class NeutronFirewallRule implements Serializable, INeutronObject {
         this.firewallRuleName = firewallRuleName;
     }
 
-    public String getFirewallRuleTenantID() {
-        return firewallRuleTenantID;
-    }
-
-    public void setFirewallRuleTenantID(String firewallRuleTenantID) {
-        this.firewallRuleTenantID = firewallRuleTenantID;
-    }
-
-    public String getID() {
-        return firewallRuleUUID;
-    }
-
-    public void setID(String id) {
-        firewallRuleUUID = id;
-    }
-
-    // @deprecated use getID()
-    public String getFirewallRuleUUID() {
-        return firewallRuleUUID;
-    }
-
-    // @deprecated use setID()
-    public void setFireWallRuleID(String firewallRuleUUID) {
-        this.firewallRuleUUID = firewallRuleUUID;
-    }
-
     public NeutronFirewallRule extractFields(List<String> fields) {
         NeutronFirewallRule ans = new NeutronFirewallRule();
         Iterator<String> i = fields.iterator();
@@ -244,17 +212,11 @@ public class NeutronFirewallRule implements Serializable, INeutronObject {
                 ans.setID(this.getID());
             }
             if (s.equals("tenant_id")) {
-                ans.setFirewallRuleTenantID(this.getFirewallRuleTenantID());
+                ans.setTenantID(this.getTenantID());
             }
             if (s.equals("name")) {
                 ans.setFirewallRuleName(this.getFirewallRuleName());
             }
-            if (s.equals("description")) {
-                ans.setFirewallRuleDescription(this.getFirewallRuleDescription());
-            }
-            if (s.equals("status")) {
-                ans.setFirewallRuleStatus(this.getFirewallRuleStatus());
-            }
             if (s.equals("shared")) {
                 ans.setFirewallRuleIsShared(firewallRuleIsShared);
             }
@@ -270,11 +232,17 @@ public class NeutronFirewallRule implements Serializable, INeutronObject {
             if (s.equals("destination_ip_address")) {
                 ans.setFirewallRuleDstIpAddr(this.getFirewallRuleDstIpAddr());
             }
-            if (s.equals("source_port")) {
-                ans.setFirewallRuleSrcPort(this.getFirewallRuleSrcPort());
+            if (s.equals("source_port_range_min")) {
+                ans.setFirewallRuleSrcPortRangeMin(this.getFirewallRuleSrcPortRangeMin());
+            }
+            if (s.equals("source_port_range_max")) {
+                ans.setFirewallRuleSrcPortRangeMax(this.getFirewallRuleSrcPortRangeMax());
             }
-            if (s.equals("destination_port")) {
-                ans.setFirewallRuleDstPort(this.getFirewallRuleDstPort());
+            if (s.equals("destination_port_range_min")) {
+                ans.setFirewallRuleDstPortRangeMin(this.getFirewallRuleDstPortRangeMin());
+            }
+            if (s.equals("destination_port_range_max")) {
+                ans.setFirewallRuleDstPortRangeMax(this.getFirewallRuleDstPortRangeMax());
             }
             if (s.equals("position")) {
                 ans.setFirewallRulePosition(this.getFirewallRulePosition());
@@ -292,26 +260,18 @@ public class NeutronFirewallRule implements Serializable, INeutronObject {
 
     @Override
     public String toString() {
-        return "firewallPolicyRules{" +
-            "firewallRuleUUID='" + firewallRuleUUID + '\'' +
-            ", firewallRuleTenantID='" + firewallRuleTenantID + '\'' +
-            ", firewallRuleName='" + firewallRuleName + '\'' +
-            ", firewallRuleDescription='" + firewallRuleDescription + '\'' +
-            ", firewallRuleStatus='" + firewallRuleStatus + '\'' +
-            ", firewallRuleIsShared=" + firewallRuleIsShared +
-            ", firewallRulePolicyID=" + firewallRulePolicyID +
-            ", firewallRuleProtocol='" + firewallRuleProtocol + '\'' +
-            ", firewallRuleIpVer=" + firewallRuleIpVer +
-            ", firewallRuleSrcIpAddr='" + firewallRuleSrcIpAddr + '\'' +
-            ", firewallRuleDstIpAddr='" + firewallRuleDstIpAddr + '\'' +
-            ", firewallRuleSrcPort=" + firewallRuleSrcPort +
-            ", firewallRuleDstPort=" + firewallRuleDstPort +
-            ", firewallRulePosition=" + firewallRulePosition +
-            ", firewallRuleAction='" + firewallRuleAction + '\'' +
-            ", firewallRuleIsEnabled=" + firewallRuleIsEnabled +
-            '}';
+        return "firewallPolicyRules{" + "firewallRuleUUID='" + uuid + '\'' + ", firewallRuleTenantID='" + tenantID
+                + '\'' + ", firewallRuleName='" + firewallRuleName + '\'' + ", firewallRuleIsShared="
+                + firewallRuleIsShared + ", firewallRulePolicyID=" + firewallRulePolicyID + ", firewallRuleProtocol='"
+                + firewallRuleProtocol + '\'' + ", firewallRuleIpVer=" + firewallRuleIpVer + ", firewallRuleSrcIpAddr='"
+                + firewallRuleSrcIpAddr + '\'' + ", firewallRuleDstIpAddr='" + firewallRuleDstIpAddr + '\''
+                + ", firewallRuleSrcPort=" + firewallRuleSrcPortRangeMin + ':' + firewallRuleSrcPortRangeMax
+                + ", firewallRuleDstPort=" + firewallRuleDstPortRangeMin + ':' + firewallRuleDstPortRangeMax
+                + ", firewallRulePosition=" + firewallRulePosition + ", firewallRuleAction='" + firewallRuleAction
+                + '\'' + ", firewallRuleIsEnabled=" + firewallRuleIsEnabled + '}';
     }
 
+    @Override
     public void initDefaults() {
     }
 }