Vered Volansky has uploaded a new change for review. Change subject: core: Remove constant SIZE_IS_NOT_AVAILABLE ......................................................................
core: Remove constant SIZE_IS_NOT_AVAILABLE Using null has the same effect, this constant only complicates things. Change-Id: Ida18353f1d5c976ee70e65045b80410dded2bb1f Related-To: https://bugzilla.redhat.com/1170263 Signed-off-by: Vered Volansky <vvola...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/RepoImage.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileStatsReturnForXmlRpc.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java 6 files changed, 9 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/39004/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java index e93c237..ad68ae3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java @@ -597,7 +597,7 @@ } } - private static long retrieveIsoFileSize(Map.Entry<String, Map<String, Object>> fileStats) { + private static Long retrieveIsoFileSize(Map.Entry<String, Map<String, Object>> fileStats) { try { return Long.valueOf((String) fileStats.getValue().get(VdsProperties.size)); } catch (RuntimeException e) { @@ -605,7 +605,7 @@ // handling exception in UI will be much more complicated. log.error("File's '{}' size is illegal number: {}", fileStats.getKey(), e.getMessage()); log.debug("Exception", e); - return StorageConstants.SIZE_IS_NOT_AVAILABLE; + return null; } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/RepoImage.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/RepoImage.java index 2720e95..c462dfa 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/RepoImage.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/RepoImage.java @@ -15,7 +15,7 @@ private Guid repoDomainId; private String repoImageId; private String repoImageName; - private long size; + private Long size; private Date dateCreated; private long lastRefreshed; private ImageFileType fileType; @@ -26,8 +26,8 @@ public RepoImage() { storagePoolId = Guid.Empty; repoDomainId = Guid.Empty; - size = 0; dateCreated = new Date(); + size = null; } /** @@ -113,14 +113,14 @@ * @param size * the size to set For future use. */ - public void setSize(long size) { + public void setSize(Long size) { this.size = size; } /** * @return the size For future use. */ - public long getSize() { + public Long getSize() { return size; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java index dc33d98..37de304 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java @@ -1,7 +1,6 @@ package org.ovirt.engine.core.common.constants; public class StorageConstants { - public static final int SIZE_IS_NOT_AVAILABLE = -1; public static final int OVF_MAX_ITEMS_PER_SQL_STATEMENT = 100; public static final String HOSTED_ENGINE_LUN_DISK_ALIAS = "hosted_engine"; diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java index aaf3ecb..7ad2235 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java @@ -211,7 +211,7 @@ listOfRepoFiles.get(0).getLastRefreshed() == newRepoFileMap .getLastRefreshed()); assertSame(true, - listOfRepoFiles.get(0).getSize() == newRepoFileMap.getSize()); + listOfRepoFiles.get(0).getSize().equals(newRepoFileMap.getSize())); assertSame( true, listOfRepoFiles.get(0).getRepoDomainId() diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileStatsReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileStatsReturnForXmlRpc.java index 20188eb..0192b82 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileStatsReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileStatsReturnForXmlRpc.java @@ -55,7 +55,7 @@ private void createDefaultFileStats(Object[] fileNames) { Map<String, Object> defaultFileStats = new HashMap<>(); - defaultFileStats.put(VdsProperties.size, String.valueOf(StorageConstants.SIZE_IS_NOT_AVAILABLE)); + defaultFileStats.put(VdsProperties.size, null); for (int i = 0; i < fileNames.length; i++) { fileStats.put((String) fileNames[i], defaultFileStats); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java index 4b13e0e..3caa1dd 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java @@ -34,7 +34,7 @@ } protected boolean isUnavailable(T size) { - return size == null || size.longValue() == StorageConstants.SIZE_IS_NOT_AVAILABLE; + return size == null; } @Override -- To view, visit https://gerrit.ovirt.org/39004 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida18353f1d5c976ee70e65045b80410dded2bb1f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvola...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
