mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-24 05:41:01 +02:00
Code Issues Projects Releases Wiki Activity

Remove redundant toString() calls

Browse Source 
Change-Id: Ibb91f90054d5791733353308e86d0494734f63aa
This commit is contained in:
Sho SHIMIZU 2015-09-11 11:22:07 -07:00 committed by Gerrit Code Review
parent 49e27663c5
commit c0b211ab44
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/web/SubnetCodec.java
View File

@ -34,7 +34,7 @@ public final class SubnetCodec extends JsonCodec<Subnet> {
.put("id", subnet.id().toString())
.put("gateway_ip", subnet.gatewayIp().toString())
.put("network_id", subnet.networkId().toString())
.put("name", subnet.subnetName().toString())
.put("name", subnet.subnetName())
.put("ip_version", subnet.ipVersion().toString())
.put("cidr", subnet.cidr().toString())
.put("shared", subnet.shared())

2
apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/web/TenantNetworkCodec.java
View File

@ -33,7 +33,7 @@ public final class TenantNetworkCodec extends JsonCodec<TenantNetwork> {
checkNotNull(network, "Network cannot be null");
ObjectNode result = context.mapper().createObjectNode()
.put("id", network.id().toString())
.put("name", network.name().toString())
.put("name", network.name())
.put("admin_state_up", network.adminStateUp())
.put("status", "" + network.state())
.put("shared", network.shared())

10
apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/web/VirtualPortCodec.java
View File

@ -36,16 +36,16 @@ public final class VirtualPortCodec extends JsonCodec<VirtualPort> {
.put("id", vPort.portId().toString())
.put("network_id", vPort.networkId().toString())
.put("admin_state_up", vPort.adminStateUp())
.put("name", vPort.name().toString())
.put("name", vPort.name())
.put("status", vPort.state().toString())
.put("mac_address", vPort.macAddress().toString())
.put("tenant_id", vPort.tenantId().toString())
.put("device_id", vPort.deviceId().toString())
.put("device_owner", vPort.deviceOwner().toString())
.put("binding:vnic_type", vPort.bindingVnicType().toString())
.put("binding:Vif_type", vPort.bindingVifType().toString())
.put("device_owner", vPort.deviceOwner())
.put("binding:vnic_type", vPort.bindingVnicType())
.put("binding:Vif_type", vPort.bindingVifType())
.put("binding:host_id", vPort.bindingHostId().toString())
.put("binding:vif_details", vPort.bindingVifDetails().toString());
.put("binding:vif_details", vPort.bindingVifDetails());
result.set("allowed_address_pairs", new AllowedAddressPairCodec().encode(
vPort.allowedAddressPairs(), context));
result.set("fixed_ips", new FixedIpCodec().encode(

3
apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/TenantNetworkWebResource.java
View File

@ -95,8 +95,7 @@ public class TenantNetworkWebResource extends AbstractWebResource {
while (networkors.hasNext()) {
TenantNetwork network = networkors.next();
if ((queryId == null || queryId.equals(network.id().toString()))
&& (queryName == null || queryName.equals(network.name()
.toString()))
&& (queryName == null || queryName.equals(network.name()))
&& (queryadminStateUp == null || queryadminStateUp
.equals(network.adminStateUp()))
&& (querystate == null || querystate.equals(network.state()