Martin Betak has uploaded a new change for review. Change subject: core: Remove BusinessEntityGuidComparator class ......................................................................
core: Remove BusinessEntityGuidComparator class Remove BusinessEntityGuidComparator that can be replaced in all cases with the more generic BusinessEntityComparator with inferred types. Change-Id: I733bfbfdee01aa4c0bef344319e1dd471a3f2d79 Signed-off-by: Martin Betak <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/BusinessEntityComparator.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/BusinessEntityGuidComparator.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeOptionEntity.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkStatistics.java 7 files changed, 15 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/32134/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java index eb6f00e..8bbf6ac 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.common.businessentities; -import org.ovirt.engine.core.common.businessentities.comparators.BusinessEntityGuidComparator; +import org.ovirt.engine.core.common.businessentities.comparators.BusinessEntityComparator; import org.ovirt.engine.core.common.utils.ObjectUtils; import org.ovirt.engine.core.compat.Guid; @@ -119,6 +119,6 @@ @Override public int compareTo(DiskImageDynamic o) { - return BusinessEntityGuidComparator.<DiskImageDynamic>newInstance().compare(this, o); + return BusinessEntityComparator.newGuidInstance().compare(this, o); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java index ca32358..94a3502 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.Date; -import org.ovirt.engine.core.common.businessentities.comparators.BusinessEntityGuidComparator; +import org.ovirt.engine.core.common.businessentities.comparators.BusinessEntityComparator; import org.ovirt.engine.core.common.utils.ObjectUtils; import org.ovirt.engine.core.compat.Guid; @@ -506,7 +506,7 @@ @Override public int compareTo(VmDynamic o) { - return BusinessEntityGuidComparator.<VmDynamic>newInstance().compare(this, o); + return BusinessEntityComparator.newGuidInstance().compare(this, o); } public Long getLastWatchdogEvent() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java index da54ccf..5d19fab 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.List; -import org.ovirt.engine.core.common.businessentities.comparators.BusinessEntityGuidComparator; +import org.ovirt.engine.core.common.businessentities.comparators.BusinessEntityComparator; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.utils.ObjectUtils; import org.ovirt.engine.core.compat.Guid; @@ -213,7 +213,7 @@ @Override public int compareTo(VmStatistics o) { - return BusinessEntityGuidComparator.<VmStatistics>newInstance().compare(this, o); + return BusinessEntityComparator.newGuidInstance().compare(this, o); } public List<VmJob> getVmJobs() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/BusinessEntityComparator.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/BusinessEntityComparator.java index 7f89843..e95664e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/BusinessEntityComparator.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/BusinessEntityComparator.java @@ -4,6 +4,7 @@ import java.util.Comparator; import org.ovirt.engine.core.common.businessentities.BusinessEntity; +import org.ovirt.engine.core.compat.Guid; /** * Generic for implementing a business entity comparator based on ID comparison @@ -18,4 +19,8 @@ public static <T extends BusinessEntity<ID>, ID extends Serializable & Comparable<? super ID>> BusinessEntityComparator<T, ID> newInstance() { return new BusinessEntityComparator<T, ID>(); } + + public static <T extends BusinessEntity<Guid>> BusinessEntityComparator<T, Guid> newGuidInstance() { + return new BusinessEntityComparator<T, Guid>(); + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/BusinessEntityGuidComparator.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/BusinessEntityGuidComparator.java deleted file mode 100644 index a1aa415..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/BusinessEntityGuidComparator.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.ovirt.engine.core.common.businessentities.comparators; - -import org.ovirt.engine.core.common.businessentities.BusinessEntity; -import org.ovirt.engine.core.compat.Guid; - -public class BusinessEntityGuidComparator<T extends BusinessEntity<Guid>> extends BusinessEntityComparator<T, Guid> { - - public static <T extends BusinessEntity<Guid>> BusinessEntityGuidComparator<T> newInstance() { - return new BusinessEntityGuidComparator<T>(); - } - - -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeOptionEntity.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeOptionEntity.java index 4283ae4..d724ffb 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeOptionEntity.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeOptionEntity.java @@ -4,7 +4,7 @@ import org.ovirt.engine.core.common.businessentities.BusinessEntity; import org.ovirt.engine.core.common.businessentities.IVdcQueryable; -import org.ovirt.engine.core.common.businessentities.comparators.BusinessEntityGuidComparator; +import org.ovirt.engine.core.common.businessentities.comparators.BusinessEntityComparator; import org.ovirt.engine.core.common.validation.group.RemoveEntity; import org.ovirt.engine.core.common.validation.group.gluster.SetVolumeOption; import org.ovirt.engine.core.compat.Guid; @@ -118,6 +118,6 @@ @Override public int compareTo(GlusterVolumeOptionEntity obj) { - return BusinessEntityGuidComparator.<GlusterVolumeOptionEntity>newInstance().compare(this, obj); + return BusinessEntityComparator.newGuidInstance().compare(this, obj); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkStatistics.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkStatistics.java index 7d9f6f1..6b08023 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkStatistics.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkStatistics.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.common.businessentities.network; -import org.ovirt.engine.core.common.businessentities.comparators.BusinessEntityGuidComparator; +import org.ovirt.engine.core.common.businessentities.comparators.BusinessEntityComparator; import org.ovirt.engine.core.compat.Guid; /** @@ -34,7 +34,7 @@ @Override public int compareTo(VmNetworkStatistics o) { - return BusinessEntityGuidComparator.<VmNetworkStatistics>newInstance().compare(this, o); + return BusinessEntityComparator.newGuidInstance().compare(this, o); } @Override -- To view, visit http://gerrit.ovirt.org/32134 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I733bfbfdee01aa4c0bef344319e1dd471a3f2d79 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Betak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
