Martin Mucha has uploaded a new change for review.
Change subject: core: refactored overgrown methods and calls
......................................................................
core: refactored overgrown methods and calls
Change-Id: I0ec9c8ab12069851c623776ecdde69f07978b0ed
Signed-off-by: Martin Mucha <mmu...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java
1 file changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/41274/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 4ac1243..7dfebe5 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
@@ -31,6 +31,7 @@
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.errors.VdcBLLException;
import org.ovirt.engine.core.common.errors.VdcBllErrors;
+import org.ovirt.engine.core.common.interfaces.VDSBrokerFrontend;
import org.ovirt.engine.core.common.utils.Pair;
import org.ovirt.engine.core.common.vdscommands.GetFileStatsParameters;
import org.ovirt.engine.core.common.vdscommands.IrsBaseVDSCommandParameters;
@@ -577,19 +578,22 @@
public Object runInTransaction() {
long currentTime = System.currentTimeMillis();
repoFileMetaDataDao.removeRepoDomainFileList(repoStorageDomainId, imageType);
- RepoImage repo_md;
for (Map.Entry<String, Map<String, Object>> entry
: fileStats.entrySet()) {
- repo_md = new RepoImage();
- repo_md.setLastRefreshed(currentTime);
- repo_md.setSize(retrieveIsoFileSize(entry));
- repo_md.setRepoDomainId(repoStorageDomainId);
- repo_md.setDateCreated(null);
- repo_md.setRepoImageId(entry.getKey());
- repo_md.setRepoImageName(null);
- repo_md.setFileType(imageType);
- repoFileMetaDataDao.addRepoFileMap(repo_md);
+
repoFileMetaDataDao.addRepoFileMap(newRepoImage(currentTime, entry));
}
return true;
+ }
+
+ public RepoImage newRepoImage(long currentTime,
Map.Entry<String, Map<String, Object>> entry) {
+ RepoImage repo_md = new RepoImage();
+ repo_md.setLastRefreshed(currentTime);
+ repo_md.setSize(retrieveIsoFileSize(entry));
+ repo_md.setRepoDomainId(repoStorageDomainId);
+ repo_md.setDateCreated(null);
+ repo_md.setRepoImageId(entry.getKey());
+ repo_md.setRepoImageName(null);
+ repo_md.setFileType(imageType);
+ return repo_md;
}
});
} finally {
@@ -749,23 +753,19 @@
Guid repoStorageDomainId,
String filePattern,
VDSCommandType alternateGetFileStatsCommand) {
- VDSReturnValue returnValue;
StoragePool dc = getStoragePoolDAO().get(repoStoragePoolId);
+ VDSBrokerFrontend resourceManager =
Backend.getInstance().getResourceManager();
+
if (FeatureSupported.getFileStats(dc.getCompatibilityVersion())) {
- returnValue = Backend
- .getInstance()
- .getResourceManager()
- .RunVdsCommand(VDSCommandType.GetFileStats,
- new GetFileStatsParameters(repoStoragePoolId,
- repoStorageDomainId, filePattern, false));
+ GetFileStatsParameters parameters = new
GetFileStatsParameters(repoStoragePoolId,
+ repoStorageDomainId,
+ filePattern,
+ false);
+ return resourceManager.RunVdsCommand(VDSCommandType.GetFileStats,
parameters);
} else {
- returnValue = Backend
- .getInstance()
- .getResourceManager()
- .RunVdsCommand(alternateGetFileStatsCommand,
- new
IrsBaseVDSCommandParameters(repoStoragePoolId));
+ return resourceManager.RunVdsCommand(alternateGetFileStatsCommand,
+ new IrsBaseVDSCommandParameters(repoStoragePoolId));
}
- return returnValue;
}
/**
--
To view, visit https://gerrit.ovirt.org/41274
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ec9c8ab12069851c623776ecdde69f07978b0ed
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Mucha <mmu...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
