From da1f23e3fbca3a4687cb102da96f77290ce23c46 Mon Sep 17 00:00:00 2001 From: Adam Lowe Date: Tue, 6 Mar 2012 18:09:54 +0000 Subject: [PATCH] vcloud-director 1.5: addressing '_interface' nonsense --- .../director/v1_5/domain/StaticRoute.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java index f3e8ce4318..e898b9017c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java @@ -56,7 +56,7 @@ import com.google.common.base.Objects; "name", "network", "nextHopIp", - "_interface" + "theInterface" }) public class StaticRoute { @@ -118,20 +118,17 @@ public class StaticRoute { } } - private StaticRoute(String name, String network, String nextHopIp, String _interface) { + private StaticRoute(String name, String network, String nextHopIp, String theInterface) { this.name = checkNotNull(name, "name"); this.network = checkNotNull(network, "network"); this.nextHopIp = checkNotNull(nextHopIp, "nextHopIp"); - this._interface = checkNotNull(_interface, "interface"); + this.theInterface = checkNotNull(theInterface, "interface"); } private StaticRoute() { // for JAXB } - private StaticRoute(String _interface) { - this._interface = _interface; - } @XmlElement(name = "Name", required = true) protected String name; @@ -140,7 +137,7 @@ public class StaticRoute { @XmlElement(name = "NextHopIp", required = true) protected String nextHopIp; @XmlElement(name = "Interface", required = true) - protected String _interface; + protected String theInterface; /** * Gets the value of the name property. @@ -179,7 +176,7 @@ public class StaticRoute { * {@link String } */ public String getInterface() { - return _interface; + return theInterface; } @Override @@ -192,7 +189,7 @@ public class StaticRoute { return equal(name, that.name) && equal(network, that.network) && equal(nextHopIp, that.nextHopIp) && - equal(_interface, that._interface); + equal(theInterface, that.theInterface); } @Override @@ -200,7 +197,7 @@ public class StaticRoute { return Objects.hashCode(name, network, nextHopIp, - _interface); + theInterface); } @Override @@ -209,6 +206,6 @@ public class StaticRoute { .add("name", name) .add("network", network) .add("nextHopIp", nextHopIp) - .add("_interface", _interface).toString(); + .add("interface", theInterface).toString(); } }