Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vcloud-director 1.5: addressing '_interface' nonsense

This commit is contained in:
Adam Lowe 2012-03-06 18:09:54 +00:00
parent 03e622ba2a
commit da1f23e3fb
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java
View File

@ -56,7 +56,7 @@ import com.google.common.base.Objects;
"name", "name",
"network", "network",
"nextHopIp", "nextHopIp",
"_interface" "theInterface"
}) })
public class StaticRoute { 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.name = checkNotNull(name, "name");
this.network = checkNotNull(network, "network"); this.network = checkNotNull(network, "network");
this.nextHopIp = checkNotNull(nextHopIp, "nextHopIp"); this.nextHopIp = checkNotNull(nextHopIp, "nextHopIp");
this._interface = checkNotNull(_interface, "interface"); this.theInterface = checkNotNull(theInterface, "interface");
} }
private StaticRoute() { private StaticRoute() {
// for JAXB // for JAXB
} }
private StaticRoute(String _interface) {
this._interface = _interface;
}
@XmlElement(name = "Name", required = true) @XmlElement(name = "Name", required = true)
protected String name; protected String name;
@ -140,7 +137,7 @@ public class StaticRoute {
@XmlElement(name = "NextHopIp", required = true) @XmlElement(name = "NextHopIp", required = true)
protected String nextHopIp; protected String nextHopIp;
@XmlElement(name = "Interface", required = true) @XmlElement(name = "Interface", required = true)
protected String _interface; protected String theInterface;
/** /**
* Gets the value of the name property. * Gets the value of the name property.
@ -179,7 +176,7 @@ public class StaticRoute {
* {@link String } * {@link String }
*/ */
public String getInterface() { public String getInterface() {
return _interface; return theInterface;
} }
@Override @Override
@ -192,7 +189,7 @@ public class StaticRoute {
return equal(name, that.name) && return equal(name, that.name) &&
equal(network, that.network) && equal(network, that.network) &&
equal(nextHopIp, that.nextHopIp) && equal(nextHopIp, that.nextHopIp) &&
equal(_interface, that._interface); equal(theInterface, that.theInterface);
} }
@Override @Override
@ -200,7 +197,7 @@ public class StaticRoute {
return Objects.hashCode(name, return Objects.hashCode(name,
network, network,
nextHopIp, nextHopIp,
_interface); theInterface);
} }
@Override @Override
@ -209,6 +206,6 @@ public class StaticRoute {
.add("name", name) .add("name", name)
.add("network", network) .add("network", network)
.add("nextHopIp", nextHopIp) .add("nextHopIp", nextHopIp)
.add("_interface", _interface).toString(); .add("interface", theInterface).toString();
} }
} }