[Engine-patches] Change in ovirt-engine[master]: core: making updateDate a member

[laravot]

Liron Ar has uploaded a new change for review.

Change subject: core: making updateDate a member
......................................................................

core: making updateDate a member

chaing updateDate to be a class member to avoid passing it between the
different class methods.

Change-Id: I33af57ada23ca81c469f0fc01932affb8298a69f
Signed-off-by: Liron Aravot <lara...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java
1 file changed, 9 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/28398/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java
index 731cafb..b709d45 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java
@@ -51,6 +51,7 @@
     private StorageDomain storageDomain;
     private int ovfDiskCount;
     private String postUpdateDescription;
+    private Date updateDate;
 
     public ProcessOvfUpdateForStorageDomainCommand(T parameters) {
         super(parameters);
@@ -109,7 +110,7 @@
                         getParameters().getStoragePoolId());
     }
 
-    private String getPostUpdateOvfStoreDescription(Date updateDate) {
+    private String getPostUpdateOvfStoreDescription() {
         if (postUpdateDescription == null) {
             postUpdateDescription = generateOvfStoreDescription(updateDate, 
true);
         }
@@ -126,7 +127,7 @@
         return buildJson(description);
     }
 
-    private String generateInfoFileData(Date updateDate) {
+    private String generateInfoFileData() {
         Map<String, Object> data = new HashMap<>();
         data.put(OvfInfoFileConstants.LastUpdated, updateDate.toString());
         data.put(OvfInfoFileConstants.Domains, 
Arrays.asList(getParameters().getStorageDomainId()));
@@ -141,11 +142,11 @@
         }
     }
 
-    private byte[] buildOvfInfoFileByteArray(List<Guid> vmAndTemplatesIds, 
Date updateDate) {
+    private byte[] buildOvfInfoFileByteArray(List<Guid> vmAndTemplatesIds) {
         ByteArrayOutputStream bufferedOutputStream = new 
ByteArrayOutputStream();
 
         try (InMemoryTar inMemoryTar = new InMemoryTar(bufferedOutputStream)) {
-            
inMemoryTar.addTarEntry(generateInfoFileData(updateDate).getBytes(),
+            inMemoryTar.addTarEntry(generateInfoFileData().getBytes(),
                     "info.json");
             int i = 0;
             while (i < vmAndTemplatesIds.size()) {
@@ -173,14 +174,14 @@
             return;
         }
 
+        updateDate = new Date();
+
         List<Guid> vmAndTemplatesIds =
                 
getStorageDomainDAO().getVmAndTemplatesIdsByStorageDomainId(getParameters().getStorageDomainId(),
                         false,
                         false);
 
-        Date updateDate = new Date();
-
-        byte[] bytes = buildOvfInfoFileByteArray(vmAndTemplatesIds, 
updateDate);
+        byte[] bytes = buildOvfInfoFileByteArray(vmAndTemplatesIds);
 
         Pair<StorageDomainOvfInfo, DiskImage> lastOvfStoreForUpdate = 
domainOvfStoresInfoForUpdate.getLast();
 
@@ -199,7 +200,6 @@
         for (Pair<StorageDomainOvfInfo, DiskImage> pair : 
domainOvfStoresInfoForUpdate) {
             shouldUpdateLastOvfStore |=
                     performOvfUpdateForDomain(bytes,
-                            updateDate,
                             pair.getFirst(),
                             pair.getSecond(),
                             vmAndTemplatesIds);
@@ -209,7 +209,6 @@
         // backup (if we did)
         if (shouldUpdateLastOvfStore && lastOvfStoreForUpdate != null) {
             performOvfUpdateForDomain(bytes,
-                    updateDate,
                     lastOvfStoreForUpdate.getFirst(),
                     lastOvfStoreForUpdate.getSecond(),
                     vmAndTemplatesIds);
@@ -238,7 +237,6 @@
     }
 
     private boolean performOvfUpdateForDomain(byte[] ovfData,
-            Date updateDate,
             StorageDomainOvfInfo storageDomainOvfInfo,
             DiskImage ovfDisk,
             List<Guid> vmAndTemplatesIds) {
@@ -275,7 +273,7 @@
                 storageDomainOvfInfo.setStoredOvfIds(vmAndTemplatesIds);
                 storageDomainOvfInfo.setLastUpdated(updateDate);
                 setOvfVolumeDescription(storagePoolId, storageDomainId,
-                        diskId, volumeId, 
getPostUpdateOvfStoreDescription(updateDate));
+                        diskId, volumeId, getPostUpdateOvfStoreDescription());
                 getStorageDomainOvfInfoDao().update(storageDomainOvfInfo);
                 
getReturnValue().getVdsmTaskIdList().addAll(vdcReturnValueBase.getInternalVdsmTaskIdList());
                 return true;


-- 
To view, visit http://gerrit.ovirt.org/28398
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33af57ada23ca81c469f0fc01932affb8298a69f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Ar <lara...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches