Allon Mureinik has uploaded a new change for review.
Change subject: core: Apply BusinessEntityWithStatus
......................................................................
core: Apply BusinessEntityWithStatus
Applied the newly introduced BusinessEntityWithStatus to all the
relevant BusinessEntities, for clearness.
Change-Id: Ie53c03ab3b8be286ac7cbe9fcd8619923dc4350d
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Image.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.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/gluster/GlusterBrickEntity.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkStatistics.java
9 files changed, 31 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/18858/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Image.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Image.java
index 824fc23..71bf27b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Image.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Image.java
@@ -9,7 +9,7 @@
import org.ovirt.engine.core.common.validation.group.UpdateEntity;
import org.ovirt.engine.core.compat.Guid;
-public class Image implements BusinessEntity<Guid> {
+public class Image implements BusinessEntityWithStatus<Guid, ImageStatus> {
private static final long serialVersionUID = -7058426105212449257L;
@@ -120,10 +120,12 @@
this.diskId = diskId;
}
+ @Override
public ImageStatus getStatus() {
return status;
}
+ @Override
public void setStatus(ImageStatus status) {
this.status = status;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java
index 2a25ec2..bd91744 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java
@@ -16,7 +16,7 @@
* <li>Any additional devices which were relevant</li>
* </ul>
*/
-public class Snapshot extends IVdcQueryable implements BusinessEntity<Guid> {
+public class Snapshot extends IVdcQueryable implements
BusinessEntityWithStatus<Guid, Snapshot.SnapshotStatus> {
/**
* Needed for java serialization/deserialization mechanism.
@@ -131,10 +131,12 @@
this.id = id;
}
+ @Override
public SnapshotStatus getStatus() {
return status;
}
+ @Override
public void setStatus(SnapshotStatus status) {
this.status = status;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
index 1fb204a..48261d2 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
@@ -3,7 +3,7 @@
import org.ovirt.engine.core.common.utils.ObjectUtils;
import org.ovirt.engine.core.compat.Guid;
-public class StoragePoolIsoMap implements BusinessEntity<StoragePoolIsoMapId> {
+public class StoragePoolIsoMap implements
BusinessEntityWithStatus<StoragePoolIsoMapId, StorageDomainStatus> {
private static final long serialVersionUID = -2829958589095415567L;
@@ -48,6 +48,7 @@
private Integer persistentStorageDomainStatus;
+ @Override
public StorageDomainStatus getStatus() {
if (persistentStorageDomainStatus == null) {
return null;
@@ -55,6 +56,7 @@
return StorageDomainStatus.forValue(persistentStorageDomainStatus);
}
+ @Override
public void setStatus(StorageDomainStatus value) {
if (value == null) {
persistentStorageDomainStatus = null;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
index b079a4e..5275592 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
@@ -15,7 +15,7 @@
import org.ovirt.engine.core.compat.StringHelper;
import org.ovirt.engine.core.compat.Version;
-public class VdsDynamic implements BusinessEntity<Guid> {
+public class VdsDynamic implements BusinessEntityWithStatus<Guid, VDSStatus> {
private static final long serialVersionUID = -6010035855157006935L;
private Guid id;
@@ -238,10 +238,12 @@
this.physical_mem_mb = value;
}
+ @Override
public VDSStatus getStatus() {
return status;
}
+ @Override
public void setStatus(VDSStatus value) {
this.status = value;
}
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 2c068b2..b274814 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
@@ -7,7 +7,7 @@
import org.ovirt.engine.core.common.utils.ObjectUtils;
import org.ovirt.engine.core.compat.Guid;
-public class VmDynamic implements BusinessEntity<Guid>, Comparable<VmDynamic> {
+public class VmDynamic implements BusinessEntityWithStatus<Guid, VMStatus>,
Comparable<VmDynamic> {
private static final long serialVersionUID = 7789482445091432555L;
private Guid id;
@@ -275,10 +275,12 @@
this.runOnVds = value;
}
+ @Override
public VMStatus getStatus() {
return this.status;
}
+ @Override
public void setStatus(VMStatus value) {
this.status = value;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
index c99215f..7b53373 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
@@ -2,7 +2,7 @@
import javax.validation.constraints.NotNull;
-import org.ovirt.engine.core.common.businessentities.BusinessEntity;
+import org.ovirt.engine.core.common.businessentities.BusinessEntityWithStatus;
import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
import org.ovirt.engine.core.common.utils.ObjectUtils;
import org.ovirt.engine.core.common.validation.group.CreateEntity;
@@ -19,7 +19,7 @@
* @see GlusterVolumeEntity
* @see GlusterBrickStatus
*/
-public class GlusterBrickEntity extends IVdcQueryable implements
BusinessEntity<Guid> {
+public class GlusterBrickEntity extends IVdcQueryable implements
BusinessEntityWithStatus<Guid, GlusterStatus> {
private static final long serialVersionUID = 7119439284741452278L;
@NotNull(message = "VALIDATION.GLUSTER.BRICK.ID.NOT_NULL", groups = {
RemoveBrick.class })
@@ -78,10 +78,12 @@
return brickDirectory;
}
+ @Override
public GlusterStatus getStatus() {
return status;
}
+ @Override
public void setStatus(GlusterStatus status) {
this.status = status;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java
index 070c85d..f7637a7 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java
@@ -13,7 +13,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import org.ovirt.engine.core.common.businessentities.BusinessEntity;
+import org.ovirt.engine.core.common.businessentities.BusinessEntityWithStatus;
import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
import org.ovirt.engine.core.common.constants.gluster.GlusterConstants;
import org.ovirt.engine.core.common.utils.ListUtils;
@@ -37,7 +37,7 @@
* @see GlusterVolumeOptionEntity
* @see AccessProtocol
*/
-public class GlusterVolumeEntity extends IVdcQueryable implements
BusinessEntity<Guid> {
+public class GlusterVolumeEntity extends IVdcQueryable implements
BusinessEntityWithStatus<Guid, GlusterStatus> {
private static final long serialVersionUID = 2355384696827317277L;
@NotNull(message = "VALIDATION.GLUSTER.VOLUME.ID.NOT_NULL", groups = {
RemoveEntity.class })
@@ -137,10 +137,12 @@
setVolumeType(GlusterVolumeType.fromValue(volumeType));
}
+ @Override
public GlusterStatus getStatus() {
return status;
}
+ @Override
public void setStatus(GlusterStatus status) {
this.status = status;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java
index 6b19063..da42b82 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java
@@ -1,10 +1,10 @@
package org.ovirt.engine.core.common.businessentities.network;
-import org.ovirt.engine.core.common.businessentities.BusinessEntity;
+import org.ovirt.engine.core.common.businessentities.BusinessEntityWithStatus;
import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
import org.ovirt.engine.core.compat.Guid;
-public class NetworkCluster extends IVdcQueryable implements
BusinessEntity<NetworkClusterId> {
+public class NetworkCluster extends IVdcQueryable implements
BusinessEntityWithStatus<NetworkClusterId, NetworkStatus> {
private static final long serialVersionUID = -4900811332744926545L;
private NetworkClusterId id;
@@ -67,10 +67,12 @@
id.setNetworkId(value);
}
+ @Override
public NetworkStatus getStatus() {
return this.status;
}
+ @Override
public void setStatus(NetworkStatus value) {
this.status = value;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkStatistics.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkStatistics.java
index 63fd6ff..bd40535 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkStatistics.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkStatistics.java
@@ -1,13 +1,13 @@
package org.ovirt.engine.core.common.businessentities.network;
-import org.ovirt.engine.core.common.businessentities.BusinessEntity;
+import org.ovirt.engine.core.common.businessentities.BusinessEntityWithStatus;
import org.ovirt.engine.core.compat.Guid;
/**
* <code>NetworkStatistics</code>
*
*/
-public abstract class NetworkStatistics implements BusinessEntity<Guid> {
+public abstract class NetworkStatistics implements
BusinessEntityWithStatus<Guid, InterfaceStatus> {
private static final long serialVersionUID = -748737255583275169L;
private Guid id;
@@ -47,6 +47,7 @@
* @param status
* the status
*/
+ @Override
public void setStatus(InterfaceStatus status) {
this.status = status;
}
@@ -56,6 +57,7 @@
*
* @return the status
*/
+ @Override
public InterfaceStatus getStatus() {
return status;
}
--
To view, visit http://gerrit.ovirt.org/18858
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie53c03ab3b8be286ac7cbe9fcd8619923dc4350d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
