Lior Vernia has uploaded a new change for review. Change subject: webadmin: Clean up interface cloning code ......................................................................
webadmin: Clean up interface cloning code VdsNetworkInterface entities didn't seem to be cloned at all so that code was removed, while the code cloning VmNetworkInterface was modified to use a type-safe overload of the clone() method (instead of the generic one that uses reflection). Change-Id: I1cfb4517ea2deb7fc6d5b49587c16b1d34026552 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java 2 files changed, 4 insertions(+), 46 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/36464/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java index 958a058..608b936 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java @@ -21,8 +21,6 @@ import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; import org.ovirt.engine.core.common.businessentities.network.NetworkStatistics; import org.ovirt.engine.core.common.businessentities.network.ProviderNetwork; -import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; -import org.ovirt.engine.core.common.businessentities.network.VdsNetworkStatistics; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.businessentities.network.VmNetworkStatistics; import org.ovirt.engine.core.common.scheduling.ClusterPolicy; @@ -31,7 +29,6 @@ import org.ovirt.engine.core.compat.NotImplementedException; import org.ovirt.engine.core.compat.Version; -@SuppressWarnings("unused") public final class Cloner { public static Object clone(Object instance) @@ -75,14 +72,6 @@ if (instance instanceof VmTemplate) { return cloneVmTemplate((VmTemplate) instance); - } - if (instance instanceof VmNetworkInterface) - { - return cloneVmNetworkInterface((VmNetworkInterface) instance); - } - if (instance instanceof VdsNetworkInterface) - { - return cloneVdsNetworkInterface((VdsNetworkInterface) instance); } if (instance instanceof VmStatic) { @@ -533,7 +522,7 @@ return obj; } - private static void cloneNetworkStatisticss(NetworkStatistics instance, NetworkStatistics obj) + private static void cloneNetworkStatistics(NetworkStatistics instance, NetworkStatistics obj) { obj.setId(instance.getId()); obj.setReceiveDropRate(instance.getReceiveDropRate()); @@ -543,48 +532,17 @@ obj.setStatus(instance.getStatus()); } - private static VdsNetworkStatistics cloneVdsNetworkStatistics(VdsNetworkStatistics instance) - { - VdsNetworkStatistics obj = new VdsNetworkStatistics(); - - cloneNetworkStatisticss(instance, obj); - obj.setVdsId(instance.getVdsId()); - - return obj; - } - - private static Object cloneVdsNetworkInterface(VdsNetworkInterface vdsNetworkInterface) - { - VdsNetworkInterface obj = new VdsNetworkInterface(); - - obj.setAddress(vdsNetworkInterface.getAddress()); - obj.setBonded(vdsNetworkInterface.getBonded()); - obj.setBondName(vdsNetworkInterface.getBondName()); - obj.setBondOptions(vdsNetworkInterface.getBondOptions()); - obj.setBondType(vdsNetworkInterface.getBondType()); - obj.setBootProtocol(vdsNetworkInterface.getBootProtocol()); - obj.setGateway(vdsNetworkInterface.getGateway()); - obj.setId(vdsNetworkInterface.getId()); - obj.setMacAddress(vdsNetworkInterface.getMacAddress()); - obj.setName(vdsNetworkInterface.getName()); - obj.setNetworkName(vdsNetworkInterface.getNetworkName()); - obj.setSpeed(vdsNetworkInterface.getSpeed()); - obj.setStatistics(cloneVdsNetworkStatistics(vdsNetworkInterface.getStatistics())); - - return obj; - } - private static VmNetworkStatistics cloneVmNetworkStatistics(VmNetworkStatistics instance) { VmNetworkStatistics obj = new VmNetworkStatistics(); - cloneNetworkStatisticss(instance, obj); + cloneNetworkStatistics(instance, obj); obj.setVmId(instance.getVmId()); return obj; } - private static Object cloneVmNetworkInterface(VmNetworkInterface vmNetworkInterface) + public static VmNetworkInterface clone(VmNetworkInterface vmNetworkInterface) { VmNetworkInterface obj = new VmNetworkInterface(); obj.setId(vmNetworkInterface.getId()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java index 81b91b5..a3a84f7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java @@ -86,7 +86,7 @@ @Override protected VmNetworkInterface createBaseNic() { - return (VmNetworkInterface) Cloner.clone(getNic()); + return Cloner.clone(getNic()); } @Override -- To view, visit http://gerrit.ovirt.org/36464 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1cfb4517ea2deb7fc6d5b49587c16b1d34026552 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
