Martin Mucha has uploaded a new change for review.
Change subject: core: long method refactor
......................................................................
core: long method refactor
extracted duplicates into methods.
this code is more readable with each pair on one line. Can be better
if refactored into class, if one doing CR is ok with that, I can do
it.
Comment: isn't it an error, ending with coma?
Change-Id: I832bc8c7e8bdfb2948f2137922e738fc6e702e59
Signed-off-by: Martin Mucha <mmu...@redhat.com>
---
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
1 file changed, 29 insertions(+), 30 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/88/29588/1
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
index ffe49aa..c8d8f37 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
@@ -199,37 +199,36 @@
* @return a unique object id
*/
private static String composeObjectId(AuditLogableBase logable,
AuditLogType logType) {
- final char DELIMITER = ',';
- StringBuilder sb = new StringBuilder();
- sb.append("type=");
- sb.append(logType);
- sb.append(DELIMITER);
- sb.append("sd=");
- sb.append(logable.getStorageDomainId() == null ? "" :
logable.getStorageDomainId().toString());
- sb.append(DELIMITER);
- sb.append("dc=");
- sb.append(logable.getStoragePoolId() == null ? "" :
logable.getStoragePoolId().toString());
- sb.append(DELIMITER);
- sb.append("user=");
- sb.append(logable.getUserId() == null ? "" :
logable.getUserId().toString());
- sb.append(DELIMITER);
- sb.append("cluster=");
- sb.append(logable.getVdsGroupId().toString());
- sb.append(DELIMITER);
- sb.append("vds=");
- sb.append(logable.getVdsId().toString());
- sb.append(DELIMITER);
- sb.append("vm=");
- sb.append(logable.getVmId().equals(Guid.Empty) ? "" :
logable.getVmId().toString());
- sb.append(DELIMITER);
- sb.append("template=");
- sb.append(logable.getVmTemplateId().equals(Guid.Empty) ? "" :
logable.getVmTemplateId().toString());
- sb.append(DELIMITER);
- sb.append("customId=");
- sb.append(StringUtils.defaultString(logable.getCustomId()));
- sb.append(DELIMITER);
+ final StringBuilder builder = new StringBuilder();
- return sb.toString();
+ compose(builder, "type", logType.toString());
+ compose(builder, "sd",
nullToEmptyString(logable.getStorageDomainId()));
+ compose(builder, "dc", nullToEmptyString(logable.getStoragePoolId()));
+ compose(builder, "user", nullToEmptyString(logable.getUserId()));
+ compose(builder, "cluster", logable.getVdsGroupId().toString());
+ compose(builder, "vds", logable.getVdsId().toString());
+ compose(builder, "vm", emptyGuidToEmptyString(logable.getVmId()));
+ compose(builder, "template",
emptyGuidToEmptyString(logable.getVmTemplateId()));
+ compose(builder, "customId",
StringUtils.defaultString(logable.getCustomId()));
+
+ return builder.toString();
+ }
+
+ private static void compose(StringBuilder builder, String key, String
value) {
+ final char DELIMITER = ',';
+ builder.append(key).append('=').append(value).append(DELIMITER);
+ }
+
+ private static String emptyGuidToEmptyString(Guid guid) {
+ return guid.equals(Guid.Empty) ? "" : guid.toString();
+ }
+
+ private static String nullToEmptyString(Object obj) {
+ return toStringNullToDefault(obj, "");
+ }
+
+ private static String toStringNullToDefault(Object obj, String
defaultValue) {
+ return obj == null ? defaultValue : obj.toString();
}
static String resolveMessage(String message, AuditLogableBase logable) {
--
To view, visit http://gerrit.ovirt.org/29588
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I832bc8c7e8bdfb2948f2137922e738fc6e702e59
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
