Martin Peřina has uploaded a new change for review. Change subject: core: Make AuditLog more Java coding conventions friendly ......................................................................
core: Make AuditLog more Java coding conventions friendly 1. Refactor constructors to make proper constructor chaining 2. Rename getter/setter acording to Java coding conventions 3. Code cleanup (remove unnecessary brackets, simplify, ...) Change-Id: Idbc05cd0006737d8ff0c923ab2b6aae18389de90 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalEventCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExternalEventCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AuditLogDAOTest.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEventsResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/EventMapper.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AuditLogSeverityColumn.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/events/EventListModelTable.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/AlertListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/event/EventPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/AlertsEventsFooterView.java 24 files changed, 339 insertions(+), 335 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/34756/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalEventCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalEventCommand.java index 15f78cc..a90a24c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalEventCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalEventCommand.java @@ -36,8 +36,8 @@ protected void executeCommand() { AuditLogableBase event = new AuditLogableBase(getParameters().getEvent()); event.setExternal(true); - String message = getParameters().getEvent().getmessage(); - switch (getParameters().getEvent().getseverity()){ + String message = getParameters().getEvent().getMessage(); + switch (getParameters().getEvent().getSeverity()){ case NORMAL: AuditLogDirector.log(event, AuditLogType.EXTERNAL_EVENT_NORMAL, message); break; @@ -53,7 +53,7 @@ } AuditLog auditLog = DbFacade.getInstance().getAuditLogDao().getByOriginAndCustomEventId(getParameters().getEvent().getOrigin(), getParameters().getEvent().getCustomEventId()); if (auditLog != null) { - setActionReturnValue(auditLog.getaudit_log_id()); + setActionReturnValue(auditLog.getAuditLogId()); setSucceeded(true); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExternalEventCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExternalEventCommandBase.java index 00657a5..a3a357e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExternalEventCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExternalEventCommandBase.java @@ -26,28 +26,28 @@ protected List<PermissionSubject> getPermissionList(AuditLog event){ List<PermissionSubject> permissionList = new ArrayList<PermissionSubject>(); - if (event.getstorage_domain_id() != null) { - permissionList.add(new PermissionSubject(new Guid(event.getstorage_domain_id().toString()), + if (event.getStorageDomainId() != null) { + permissionList.add(new PermissionSubject(new Guid(event.getStorageDomainId().toString()), VdcObjectType.Storage, ActionGroup.INJECT_EXTERNAL_EVENTS)); } - if (event.getstorage_pool_id() != null) { - permissionList.add(new PermissionSubject(new Guid(event.getstorage_pool_id().toString()), + if (event.getStoragePoolId() != null) { + permissionList.add(new PermissionSubject(new Guid(event.getStoragePoolId().toString()), VdcObjectType.StoragePool, ActionGroup.INJECT_EXTERNAL_EVENTS)); } - if (event.getuser_id() != null) { - permissionList.add(new PermissionSubject(new Guid(event.getuser_id().toString()), + if (event.getUserId() != null) { + permissionList.add(new PermissionSubject(new Guid(event.getUserId().toString()), VdcObjectType.User, ActionGroup.INJECT_EXTERNAL_EVENTS)); } - if (event.getvds_group_id() != null) { - permissionList.add(new PermissionSubject(new Guid(event.getvds_group_id().toString()), + if (event.getVdsGroupId() != null) { + permissionList.add(new PermissionSubject(new Guid(event.getVdsGroupId().toString()), VdcObjectType.VdsGroups, ActionGroup.INJECT_EXTERNAL_EVENTS)); } - if (event.getvm_id() != null) { - permissionList.add(new PermissionSubject(new Guid(event.getvm_id().toString()), + if (event.getVmId() != null) { + permissionList.add(new PermissionSubject(new Guid(event.getVmId().toString()), VdcObjectType.VM, ActionGroup.INJECT_EXTERNAL_EVENTS)); } - if (event.getvm_template_id() != null) { - permissionList.add(new PermissionSubject(new Guid(event.getvm_template_id().toString()), + if (event.getVmTemplateId() != null) { + permissionList.add(new PermissionSubject(new Guid(event.getVmTemplateId().toString()), VdcObjectType.VmTemplate, ActionGroup.INJECT_EXTERNAL_EVENTS)); } if (permissionList.isEmpty()) { // Global Event diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommand.java index fc8fdc1..91c7ac8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommand.java @@ -30,7 +30,7 @@ return failCanDoAction(VdcBllMessages.AUDIT_LOG_CANNOT_REMOVE_AUDIT_LOG_NOT_EXIST); } - if (!AuditLogSeverity.ALERT.equals(event.getseverity()) && OVIRT.equalsIgnoreCase(event.getOrigin())) { + if (!AuditLogSeverity.ALERT.equals(event.getSeverity()) && OVIRT.equalsIgnoreCase(event.getOrigin())) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_EXTERNAL_EVENT_ILLEGAL_ORIGIN); } @@ -47,7 +47,7 @@ @Override public List<PermissionSubject> getPermissionCheckSubjects() { AuditLog event = getAuditLogDao().get(getParameters().getAuditLogId()); - if (AuditLogSeverity.ALERT.equals(event.getseverity())) { + if (AuditLogSeverity.ALERT.equals(event.getSeverity())) { return Collections.singletonList(new PermissionSubject(Guid.SYSTEM, VdcObjectType.System, ActionGroup.AUDIT_LOG_MANAGEMENT)); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMIdQueryTest.java index 71ecad4..ebb9af9 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMIdQueryTest.java @@ -24,7 +24,7 @@ // Set up the expected result AuditLog expectedResult = new AuditLog(); - expectedResult.setvm_id(vmId); + expectedResult.setVmId(vmId); // Mock the DAOs AuditLogDAO auditLogDAOMock = mock(AuditLogDAO.class); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateIdQueryTest.java index fe5edd5..6db2d6c 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateIdQueryTest.java @@ -25,7 +25,7 @@ // Set up the expected result AuditLog expectedResult = new AuditLog(); - expectedResult.setvm_template_id(vmTemplateId); + expectedResult.setVmTemplateId(vmTemplateId); // Mock the DAOs AuditLogDAO auditLogDAOMock = mock(AuditLogDAO.class); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommandTest.java index 7a97c72..1fd1ad0 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommandTest.java @@ -37,14 +37,14 @@ private AuditLog getEventWithOvirtOrigin() { AuditLog auditLog = new AuditLog(); - auditLog.setaudit_log_id(EVENT_ID_2); + auditLog.setAuditLogId(EVENT_ID_2); auditLog.setOrigin(OVIRT_ORIGIN); return auditLog; } private AuditLog getEventWithExternalOrigin() { AuditLog auditLog = new AuditLog(); - auditLog.setaudit_log_id(EVENT_ID_3); + auditLog.setAuditLogId(EVENT_ID_3); auditLog.setOrigin(EXTERNAL_ORIGIN); return auditLog; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java index ca24f7d..07686e3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java @@ -48,224 +48,231 @@ private String callStack; public AuditLog() { - logType = AuditLogType.UNASSIGNED.getValue(); - severity = AuditLogSeverity.NORMAL.getValue(); - origin = "oVirt"; - customEventId = -1; - eventFloodInSec = 30; - customData = ""; + this(AuditLogType.UNASSIGNED, AuditLogSeverity.NORMAL); } - public AuditLog(AuditLogType al_type, AuditLogSeverity al_severity, String al_msg, Guid al_user_id, - String al_user_name, Guid al_vm_id, String al_vm_name, Guid al_vds_id, String al_vds_name, - Guid al_vmt_id, String al_vmt_name) { - this(); - logTime = new Date(); - logType = al_type.getValue(); - severity = al_severity.getValue(); - message = al_msg; - userId = al_user_id; - userName = al_user_name; - vmId = al_vm_id; - vmName = al_vm_name; - vdsId = al_vds_id; - vdsName = al_vds_name; - vmTemplateId = al_vmt_id; - vmTemplateName = al_vmt_name; + public AuditLog(AuditLogType type, AuditLogSeverity severity) { + this.logType = type.getValue(); + this.severity = severity.getValue(); + this.origin = "oVirt"; + this.customEventId = -1; + this.eventFloodInSec = 30; + this.customData = ""; + this.logTime = new Date(); } - public AuditLog(AuditLogType al_type, - AuditLogSeverity al_severity, - String al_msg, - Guid al_user_id, - String al_user_name, - Guid al_vm_id, - String al_vm_name, - Guid al_vds_id, - String al_vds_name, - Guid al_vmt_id, - String al_vmt_name, + public AuditLog(AuditLogType type, + AuditLogSeverity severity, + String message, + Guid userId, + String userName, + Guid vmId, + String vmName, + Guid vdsId, + String vdsName, + Guid vmTemplateId, + String vmTemplateName) { + this(type, severity); + this.message = message; + this.userId = userId; + this.userName = userName; + this.vmId = vmId; + this.vmName = vmName; + this.vdsId = vdsId; + this.vdsName = vdsName; + this.vmTemplateId = vmTemplateId; + this.vmTemplateName = vmTemplateName; + } + + public AuditLog(AuditLogType type, + AuditLogSeverity severity, + String message, + Guid userId, + String userName, + Guid vmId, + String vmName, + Guid vdsId, + String vdsName, + Guid vmTemplateId, + String vmTemplateName, String origin, int customEventId, int eventFloogInSec, String customData) { - this(al_type, - al_severity, - al_msg, - al_user_id, - al_user_name, - al_vm_id, - al_vm_name, - al_vds_id, - al_vds_name, - al_vmt_id, - al_vmt_name); + this(type, + severity, + message, + userId, + userName, + vmId, + vmName, + vdsId, + vdsName, + vmTemplateId, + vmTemplateName); this.origin = origin; this.customEventId = customEventId; this.eventFloodInSec = eventFloogInSec; this.customData = customData; } - public long getaudit_log_id() { - return this.auditLogId; + + public long getAuditLogId() { + return auditLogId; } - public void setaudit_log_id(long value) { - this.auditLogId = value; + public void setAuditLogId(long auditLogId) { + this.auditLogId = auditLogId; } - public Date getlog_time() { - return this.logTime; + public Date getLogTime() { + return logTime; } - public void setlog_time(Date value) { - this.logTime = value; + public void setLogTime(Date logTime) { + this.logTime = logTime; } - public String getmessage() { - return this.message; + public String getMessage() { + return message; } - public void setmessage(String value) { - this.message = value; + public void setMessage(String message) { + this.message = message; } - public Guid getuser_id() { - return this.userId; + public Guid getUserId() { + return userId; } - public void setuser_id(Guid value) { - this.userId = value; + public void setUserId(Guid userId) { + this.userId = userId; } - public String getuser_name() { - return this.userName; + public String getUserName() { + return userName; } - public void setuser_name(String value) { - this.userName = value; + public void setUserName(String userName) { + this.userName = userName; } public Guid getQuotaId() { - return this.quotaId; + return quotaId; } - public void setQuotaId(Guid value) { - this.quotaId = value; + public void setQuotaId(Guid quotaId) { + this.quotaId = quotaId; } public String getQuotaName() { - return this.quotaName; + return quotaName; } - public void setQuotaName(String value) { - this.quotaName = value; + public void setQuotaName(String quotaName) { + this.quotaName = quotaName; } - public Guid getvds_id() { - return this.vdsId; + public Guid getVdsId() { + return vdsId; } - public void setvds_id(Guid value) { - this.vdsId = value; + public void setVdsId(Guid vdsId) { + this.vdsId = vdsId; } - public String getvds_name() { - return this.vdsName; + public String getVdsName() { + return vdsName; } - public void setvds_name(String value) { - this.vdsName = value; + public void setVdsName(String vdsName) { + this.vdsName = vdsName; } - public Guid getvm_template_id() { - return this.vmTemplateId; + public Guid getVmTemplateId() { + return vmTemplateId; } - public void setvm_template_id(Guid value) { - this.vmTemplateId = value; + public void setVmTemplateId(Guid vmTemplateId) { + this.vmTemplateId = vmTemplateId; } - public String getvm_template_name() { - return this.vmTemplateName; + public String getVmTemplateName() { + return vmTemplateName; } - public void setvm_template_name(String value) { - this.vmTemplateName = value; + public void setVmTemplateName(String vmTemplateName) { + this.vmTemplateName = vmTemplateName; } - public Guid getvm_id() { - return this.vmId; + public Guid getVmId() { + return vmId; } - public void setvm_id(Guid value) { - this.vmId = value; + public void setVmId(Guid vmId) { + this.vmId = vmId; } - public String getvm_name() { - return this.vmName; + public String getVmName() { + return vmName; } - public void setvm_name(String value) { - this.vmName = value; + public void setVmName(String vmName) { + this.vmName = vmName; } - public Guid getstorage_pool_id() { + public Guid getStoragePoolId() { return storagePoolId; } - public void setstorage_pool_id(Guid value) { - storagePoolId = value; + public void setStoragePoolId(Guid storagePoolId) { + this.storagePoolId = storagePoolId; } - public String getstorage_pool_name() { + public String getStoragePoolName() { return storagePoolName; } - public void setstorage_pool_name(String value) { - storagePoolName = value; + public void setStoragePoolName(String storagePoolName) { + this.storagePoolName = storagePoolName; } - public Guid getstorage_domain_id() { + public Guid getStorageDomainId() { return storageDomainId; } - public void setstorage_domain_id(Guid value) { - storageDomainId = value; + public void setStorageDomainId(Guid storageDomainId) { + this.storageDomainId = storageDomainId; } - - - public String getstorage_domain_name() { + public String getStorageDomainName() { return storageDomainName; } - public void setstorage_domain_name(String value) { - storageDomainName = value; + public void setStorageDomainName(String storageDomainName) { + this.storageDomainName = storageDomainName; } - - - public Guid getvds_group_id() { + public Guid getVdsGroupId() { return vdsGroupId; } - public void setvds_group_id(Guid value) { - vdsGroupId = value; + public void setVdsGroupId(Guid vdsGroupId) { + this.vdsGroupId = vdsGroupId; } - public String getvds_group_name() { + public String getVdsGroupName() { return vdsGroupName; } - public void setvds_group_name(String value) { - vdsGroupName = value; + public void setVdsGroupName(String vdsGroupName) { + this.vdsGroupName = vdsGroupName; } - public AuditLogType getlog_type() { + public AuditLogType getLogType() { return AuditLogType.forValue(logType); } - public void setlog_type(AuditLogType value) { + public void setLogType(AuditLogType value) { logType = value.getValue(); } @@ -273,69 +280,69 @@ // We dont have the AuditLogType enumeration synchronized, // WSDL formatter set the enumeration value according to its string value // (enums are strings in WSDL) - public int getlog_typeValue() { - return getlog_type().getValue(); + public int getLogTypeValue() { + return getLogType().getValue(); } - public void setlog_typeValue(int value) { + public void setLogTypeValue(int value) { // Do nothing, this is mockup (WSDL need setter) } - public String getlog_type_name() { - return getlog_type().name(); + public String getLogTypeName() { + return getLogType().name(); } - public AuditLogSeverity getseverity() { + public AuditLogSeverity getSeverity() { return AuditLogSeverity.forValue(severity); } - public void setseverity(AuditLogSeverity value) { - severity = value.getValue(); + public void setSeverity(AuditLogSeverity severity) { + this.severity = severity.getValue(); } @Override public Object getQueryableId() { - return getaudit_log_id(); - } - - public void setProcessed(boolean processed) { - this.processed = processed; + return getAuditLogId(); } public boolean isProcessed() { return processed; } - public void setCorrelationId(String correlationId) { - this.correlationId = correlationId; + public void setProcessed(boolean processed) { + this.processed = processed; } public String getCorrelationId() { return correlationId; } - public void setJobId(Guid jobId) { - this.jobId = jobId; + public void setCorrelationId(String correlationId) { + this.correlationId = correlationId; } public Guid getJobId() { return jobId; } + public void setJobId(Guid jobId) { + this.jobId = jobId; + } + public Guid getGlusterVolumeId() { return glusterVolumeId; } - public void setGlusterVolumeId(Guid value) { - glusterVolumeId = value; + public void setGlusterVolumeId(Guid glusterVolumeId) { + this.glusterVolumeId = glusterVolumeId; } public String getGlusterVolumeName() { return glusterVolumeName; } - public void setGlusterVolumeName(String value) { - glusterVolumeName = value; + public void setGlusterVolumeName(String glusterVolumeName) { + this.glusterVolumeName = glusterVolumeName; } public String getOrigin() { @@ -402,32 +409,40 @@ this.quotaEnforcementType = quotaEnforcementType; } + public String getCallStack() { + return callStack; + } + + public void setCallStack(String callStack) { + this.callStack = callStack; + } + @Override public int hashCode() { final int prime = 31; int result = 1; result = prime * result + (int) (auditLogId ^ (auditLogId >>> 32)); - result = prime * result + ((logTime == null) ? 0 : logTime.hashCode()); + result = prime * result + (logTime == null ? 0 : logTime.hashCode()); result = prime * result + logType; - result = prime * result + ((message == null) ? 0 : message.hashCode()); - result = prime * result + ((storageDomainId == null) ? 0 : storageDomainId.hashCode()); - result = prime * result + ((storagePoolId == null) ? 0 : storagePoolId.hashCode()); + result = prime * result + (message == null ? 0 : message.hashCode()); + result = prime * result + (storageDomainId == null ? 0 : storageDomainId.hashCode()); + result = prime * result + (storagePoolId == null ? 0 : storagePoolId.hashCode()); result = prime * result + severity; - result = prime * result + ((userId == null) ? 0 : userId.hashCode()); - result = prime * result + ((vdsId == null) ? 0 : vdsId.hashCode()); - result = prime * result + ((quotaId == null) ? 0 : quotaId.hashCode()); - result = prime * result + ((vmId == null) ? 0 : vmId.hashCode()); - result = prime * result + ((vmTemplateId == null) ? 0 : vmTemplateId.hashCode()); + result = prime * result + (userId == null ? 0 : userId.hashCode()); + result = prime * result + (vdsId == null ? 0 : vdsId.hashCode()); + result = prime * result + (quotaId == null ? 0 : quotaId.hashCode()); + result = prime * result + (vmId == null ? 0 : vmId.hashCode()); + result = prime * result + (vmTemplateId == null ? 0 : vmTemplateId.hashCode()); result = prime * result + (processed ? 1231 : 1237); - result = prime * result + ((correlationId == null) ? 0 : correlationId.hashCode()); - result = prime * result + ((jobId == null) ? 0 : jobId.hashCode()); - result = prime * result + ((origin == null) ? 0 : origin.hashCode()); + result = prime * result + (correlationId == null ? 0 : correlationId.hashCode()); + result = prime * result + (jobId == null ? 0 : jobId.hashCode()); + result = prime * result + (origin == null ? 0 : origin.hashCode()); result = prime * result + customEventId; result = prime * result + eventFloodInSec; - result = prime * result + ((customData == null) ? 0 : customData.hashCode()); + result = prime * result + (customData == null ? 0 : customData.hashCode()); result = prime * result + (external ? 1231 : 1237); result = prime * result + (deleted ? 1231 : 1237); - result = prime * result + ((callStack == null) ? 0 : callStack.hashCode()); + result = prime * result + (callStack == null ? 0 : callStack.hashCode()); return result; } @@ -436,10 +451,7 @@ if (this == obj) { return true; } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { + if (!(obj instanceof AuditLog)) { return false; } AuditLog other = (AuditLog) obj; @@ -465,14 +477,6 @@ && external == other.external && deleted == other.deleted && ObjectUtils.objectsEqual(callStack, other.callStack)); - } - - public String getCallStack() { - return callStack; - } - - public void setCallStack(String callStack) { - this.callStack = callStack; } public String toStringForLogging() { 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 15ab660..7301fac 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 @@ -146,12 +146,12 @@ auditLogable.getVmTemplateName()); } if (auditLog != null) { - auditLog.setstorage_domain_id(auditLogable.getStorageDomainId()); - auditLog.setstorage_domain_name(auditLogable.getStorageDomainName()); - auditLog.setstorage_pool_id(auditLogable.getStoragePoolId()); - auditLog.setstorage_pool_name(auditLogable.getStoragePoolName()); - auditLog.setvds_group_id(auditLogable.getVdsGroupId()); - auditLog.setvds_group_name(auditLogable.getVdsGroupName()); + auditLog.setStorageDomainId(auditLogable.getStorageDomainId()); + auditLog.setStorageDomainName(auditLogable.getStorageDomainName()); + auditLog.setStoragePoolId(auditLogable.getStoragePoolId()); + auditLog.setStoragePoolName(auditLogable.getStoragePoolName()); + auditLog.setVdsGroupId(auditLogable.getVdsGroupId()); + auditLog.setVdsGroupName(auditLogable.getVdsGroupName()); auditLog.setCorrelationId(auditLogable.getCorrelationId()); auditLog.setJobId(auditLogable.getJobId()); auditLog.setGlusterVolumeId(auditLogable.getGlusterVolumeId()); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java index 031c555..c5f4534 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java @@ -110,8 +110,8 @@ } public AuditLogableBase(final AuditLog auditLog) { - this._storageDomainId = auditLog.getstorage_domain_id(); - this._storagePoolId = auditLog.getstorage_pool_id(); + this._storageDomainId = auditLog.getStorageDomainId(); + this._storagePoolId = auditLog.getStoragePoolId(); this.correlationId = auditLog.getCorrelationId(); this.customData = auditLog.getCustomData(); this.customEventId = auditLog.getCustomEventId(); @@ -119,15 +119,15 @@ this.glusterVolumeId = auditLog.getGlusterVolumeId(); this.glusterVolumeName = auditLog.getGlusterVolumeName(); this.jobId = auditLog.getJobId(); - this.mUserId = auditLog.getuser_id(); - this.mUserName = auditLog.getuser_name(); - this.mVdsGroupId = auditLog.getvds_group_id(); - this.mVdsId = auditLog.getvds_id(); - this.mVdsName = auditLog.getvds_name(); - this.mVmId = auditLog.getvm_id(); - this.mVmName = auditLog.getvm_name(); - this.mVmTemplateId = auditLog.getvm_template_id(); - this.mVmTemplateName = auditLog.getvm_template_name(); + this.mUserId = auditLog.getUserId(); + this.mUserName = auditLog.getUserName(); + this.mVdsGroupId = auditLog.getVdsGroupId(); + this.mVdsId = auditLog.getVdsId(); + this.mVdsName = auditLog.getVdsName(); + this.mVmId = auditLog.getVmId(); + this.mVmName = auditLog.getVmName(); + this.mVmTemplateId = auditLog.getVmTemplateId(); + this.mVmTemplateName = auditLog.getVmTemplateName(); this.origin = auditLog.getOrigin(); this.external = auditLog.isExternal(); this.callStack = auditLog.getCallStack(); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDAODbFacadeImpl.java index b7934f0..be78500 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDAODbFacadeImpl.java @@ -111,26 +111,26 @@ private MapSqlParameterSource getSqlMapper(AuditLog event) { return getCustomMapSqlParameterSource() - .addValue("audit_log_id", event.getaudit_log_id()) - .addValue("log_time", event.getlog_time()) - .addValue("log_type", event.getlog_type()) - .addValue("log_type_name", event.getlog_type_name()) - .addValue("severity", event.getseverity()) - .addValue("message", event.getmessage()) - .addValue("user_id", event.getuser_id()) - .addValue("user_name", event.getuser_name()) - .addValue("vds_id", event.getvds_id()) - .addValue("vds_name", event.getvds_name()) - .addValue("vm_id", event.getvm_id()) - .addValue("vm_name", event.getvm_name()) - .addValue("vm_template_id", event.getvm_template_id()) - .addValue("vm_template_name", event.getvm_template_name()) - .addValue("storage_pool_id", event.getstorage_pool_id()) - .addValue("storage_pool_name", event.getstorage_pool_name()) - .addValue("storage_domain_id", event.getstorage_domain_id()) - .addValue("storage_domain_name", event.getstorage_domain_name()) - .addValue("vds_group_id", event.getvds_group_id()) - .addValue("vds_group_name", event.getvds_group_name()) + .addValue("audit_log_id", event.getAuditLogId()) + .addValue("log_time", event.getLogTime()) + .addValue("log_type", event.getLogType()) + .addValue("log_type_name", event.getLogTypeName()) + .addValue("severity", event.getSeverity()) + .addValue("message", event.getMessage()) + .addValue("user_id", event.getUserId()) + .addValue("user_name", event.getUserName()) + .addValue("vds_id", event.getVdsId()) + .addValue("vds_name", event.getVdsName()) + .addValue("vm_id", event.getVmId()) + .addValue("vm_name", event.getVmName()) + .addValue("vm_template_id", event.getVmTemplateId()) + .addValue("vm_template_name", event.getVmTemplateName()) + .addValue("storage_pool_id", event.getStoragePoolId()) + .addValue("storage_pool_name", event.getStoragePoolName()) + .addValue("storage_domain_id", event.getStorageDomainId()) + .addValue("storage_domain_name", event.getStorageDomainName()) + .addValue("vds_group_id", event.getVdsGroupId()) + .addValue("vds_group_name", event.getVdsGroupName()) .addValue("correlation_id", event.getCorrelationId()) .addValue("job_id", event.getJobId()) .addValue("quota_id", event.getQuotaId()) @@ -207,28 +207,28 @@ public AuditLog mapRow(ResultSet rs, int rowNum) throws SQLException { AuditLog entity = new AuditLog(); - entity.setaudit_log_id(rs.getLong("audit_log_id")); - entity.setlog_time(DbFacadeUtils.fromDate(rs + entity.setAuditLogId(rs.getLong("audit_log_id")); + entity.setLogTime(DbFacadeUtils.fromDate(rs .getTimestamp("log_time"))); - entity.setlog_type(AuditLogType.forValue(rs.getInt("log_type"))); - entity.setseverity(AuditLogSeverity.forValue(rs + entity.setLogType(AuditLogType.forValue(rs.getInt("log_type"))); + entity.setSeverity(AuditLogSeverity.forValue(rs .getInt("severity"))); - entity.setmessage(rs.getString("message")); - entity.setuser_id(getGuid(rs, "user_id")); - entity.setuser_name(rs.getString("user_name")); - entity.setvds_id(getGuid(rs, "vds_id")); - entity.setvds_name(rs.getString("vds_name")); - entity.setvm_id(getGuid(rs, "vm_id")); - entity.setvm_name(rs.getString("vm_name")); - entity.setvm_template_id(getGuid(rs, "vm_template_id")); - entity.setvm_template_name(rs.getString("vm_template_name")); - entity.setstorage_pool_id(getGuid(rs, "storage_pool_id")); - entity.setstorage_pool_name(rs.getString("storage_pool_name")); - entity.setstorage_domain_id(getGuid(rs, "storage_domain_id")); - entity.setstorage_domain_name(rs + entity.setMessage(rs.getString("message")); + entity.setUserId(getGuid(rs, "user_id")); + entity.setUserName(rs.getString("user_name")); + entity.setVdsId(getGuid(rs, "vds_id")); + entity.setVdsName(rs.getString("vds_name")); + entity.setVmId(getGuid(rs, "vm_id")); + entity.setVmName(rs.getString("vm_name")); + entity.setVmTemplateId(getGuid(rs, "vm_template_id")); + entity.setVmTemplateName(rs.getString("vm_template_name")); + entity.setStoragePoolId(getGuid(rs, "storage_pool_id")); + entity.setStoragePoolName(rs.getString("storage_pool_name")); + entity.setStorageDomainId(getGuid(rs, "storage_domain_id")); + entity.setStorageDomainName(rs .getString("storage_domain_name")); - entity.setvds_group_id(getGuid(rs, "vds_group_id")); - entity.setvds_group_name(rs + entity.setVdsGroupId(getGuid(rs, "vds_group_id")); + entity.setVdsGroupName(rs .getString("vds_group_name")); entity.setCorrelationId(rs.getString("correlation_id")); entity.setJobId(getGuid(rs, "job_id")); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AuditLogDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AuditLogDAOTest.java index 42ec895..1fd2536 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AuditLogDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AuditLogDAOTest.java @@ -50,23 +50,23 @@ // create some test data newAuditLog = new AuditLog(); - newAuditLog.setaudit_log_id(44000); - newAuditLog.setuser_id(new Guid("9bf7c640-b620-456f-a550-0348f366544b")); - newAuditLog.setuser_name("userportal3"); - newAuditLog.setvm_id(VM_ID); - newAuditLog.setvm_name(VM_NAME); - newAuditLog.setvm_template_id(VM_TEMPLATE_ID); - newAuditLog.setvm_template_name(VM_TEMPLATE_NAME); - newAuditLog.setvds_id(VDS_ID); - newAuditLog.setvds_name("magenta-vdsc"); - newAuditLog.setlog_time(EXPECTED_DATE_FORMAT.parse("2010-12-22 14:00:00")); - newAuditLog.setlog_type(AuditLogType.IRS_DISK_SPACE_LOW_ERROR); - newAuditLog.setseverity(AuditLogSeverity.ERROR); - newAuditLog.setmessage("Critical, Low disk space. domain has 1 GB of free space"); - newAuditLog.setstorage_pool_id(new Guid("6d849ebf-755f-4552-ad09-9a090cda105d")); - newAuditLog.setstorage_pool_name("rhel6.iscsi"); - newAuditLog.setstorage_domain_id(new Guid("72e3a666-89e1-4005-a7ca-f7548004a9ab")); - newAuditLog.setstorage_domain_name("fDMzhE-wx3s-zo3q-Qcxd-T0li-yoYU-QvVePk"); + newAuditLog.setAuditLogId(44000); + newAuditLog.setUserId(new Guid("9bf7c640-b620-456f-a550-0348f366544b")); + newAuditLog.setUserName("userportal3"); + newAuditLog.setVmId(VM_ID); + newAuditLog.setVmName(VM_NAME); + newAuditLog.setVmTemplateId(VM_TEMPLATE_ID); + newAuditLog.setVmTemplateName(VM_TEMPLATE_NAME); + newAuditLog.setVdsId(VDS_ID); + newAuditLog.setVdsName("magenta-vdsc"); + newAuditLog.setLogTime(EXPECTED_DATE_FORMAT.parse("2010-12-22 14:00:00")); + newAuditLog.setLogType(AuditLogType.IRS_DISK_SPACE_LOW_ERROR); + newAuditLog.setSeverity(AuditLogSeverity.ERROR); + newAuditLog.setMessage("Critical, Low disk space. domain has 1 GB of free space"); + newAuditLog.setStoragePoolId(new Guid("6d849ebf-755f-4552-ad09-9a090cda105d")); + newAuditLog.setStoragePoolName("rhel6.iscsi"); + newAuditLog.setStorageDomainId(new Guid("72e3a666-89e1-4005-a7ca-f7548004a9ab")); + newAuditLog.setStorageDomainName("fDMzhE-wx3s-zo3q-Qcxd-T0li-yoYU-QvVePk"); newAuditLog.setQuotaId(FixturesTool.DEFAULT_QUOTA_GENERAL); newAuditLog.setQuotaName("General Quota"); newAuditLog.setGlusterVolumeId(new Guid("0e0abdbc-2a0f-4df0-8b99-cc577a7a9bb5")); @@ -222,8 +222,8 @@ assertEquals("Wrong number of results", expectedResults, results.size()); for (AuditLog auditLog : results) { - assertEquals("Wrong name of VM in result", VM_NAME, auditLog.getvm_name()); - assertEquals("Wrong template name of VM in result", VM_TEMPLATE_NAME, auditLog.getvm_template_name()); + assertEquals("Wrong name of VM in result", VM_NAME, auditLog.getVmName()); + assertEquals("Wrong template name of VM in result", VM_TEMPLATE_NAME, auditLog.getVmTemplateName()); } } @@ -274,7 +274,7 @@ */ @Test public void testSave() { - Date newAuditLogDateCuttoff = newAuditLog.getlog_time(); + Date newAuditLogDateCuttoff = newAuditLog.getLogTime(); newAuditLogDateCuttoff.setTime(newAuditLogDateCuttoff.getTime() - 1); int countBefore = dao.getAllAfterDate(newAuditLogDateCuttoff).size(); @@ -293,15 +293,15 @@ */ @Test public void testLongMessageSave() { - Date newAuditLogDateCuttoff = newAuditLog.getlog_time(); + Date newAuditLogDateCuttoff = newAuditLog.getLogTime(); newAuditLogDateCuttoff.setTime(newAuditLogDateCuttoff.getTime() - 1); List<AuditLog> before = dao.getAllAfterDate(newAuditLogDateCuttoff); // generate a value that is longer than the max configured. char[] fill = new char[Config.<Integer> getValue(ConfigValues.MaxAuditLogMessageLength) + 1]; Arrays.fill(fill, '0'); - newAuditLog.setaudit_log_id(45000); - newAuditLog.setmessage(new String(fill)); + newAuditLog.setAuditLogId(45000); + newAuditLog.setMessage(new String(fill)); newAuditLog.setExternal(true); dao.save(newAuditLog); @@ -311,7 +311,7 @@ assertEquals(1, after.size()); AuditLog result = after.get(0); assertNotNull(result); - assertTrue(result.getmessage().endsWith("...")); + assertTrue(result.getMessage().endsWith("...")); } /** @@ -319,9 +319,9 @@ */ @Test public void testRemove() { - dao.remove(existingAuditLog.getaudit_log_id()); + dao.remove(existingAuditLog.getAuditLogId()); - AuditLog result = dao.get(existingAuditLog.getaudit_log_id()); + AuditLog result = dao.get(existingAuditLog.getAuditLogId()); assertTrue(result.isDeleted()); } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java index d0cf1b7..708f510 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java @@ -62,7 +62,7 @@ try { Long longId = Long.valueOf(id); for (AuditLog auditLog : getBackendCollection()) { - if (auditLog.getaudit_log_id() == longId) + if (auditLog.getAuditLogId() == longId) return addLinks(map(auditLog)); } return notFound(); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEventsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEventsResourceTest.java index f6d9e73..5c2202d 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEventsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEventsResourceTest.java @@ -87,13 +87,13 @@ protected org.ovirt.engine.core.common.businessentities.AuditLog getEntity(int index) { AuditLog auditLogMock = control.createMock(org.ovirt.engine.core.common.businessentities.AuditLog.class); - expect(auditLogMock.getaudit_log_id()).andReturn(LOG_IDS[index]).anyTimes(); - expect(auditLogMock.getseverity()).andReturn(AuditLogSeverity.ALERT).anyTimes(); - expect(auditLogMock.getmessage()).andReturn(MESSAGES[index]).anyTimes(); + expect(auditLogMock.getAuditLogId()).andReturn(LOG_IDS[index]).anyTimes(); + expect(auditLogMock.getSeverity()).andReturn(AuditLogSeverity.ALERT).anyTimes(); + expect(auditLogMock.getMessage()).andReturn(MESSAGES[index]).anyTimes(); expect(auditLogMock.getOrigin()).andReturn(ORIGIN_NAMES[index]).anyTimes(); expect(auditLogMock.getCustomEventId()).andReturn(CUSTOMER_EVENT_IDS[index]).anyTimes(); - expect(auditLogMock.getlog_type()).andReturn(AuditLogType.EXTERNAL_ALERT).anyTimes(); - expect(auditLogMock.getlog_time()).andReturn(new Date()).anyTimes(); + expect(auditLogMock.getLogType()).andReturn(AuditLogType.EXTERNAL_ALERT).anyTimes(); + expect(auditLogMock.getLogTime()).andReturn(new Date()).anyTimes(); return auditLogMock; } diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/EventMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/EventMapper.java index fd75990..380fe66 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/EventMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/EventMapper.java @@ -24,52 +24,52 @@ @Mapping(from = AuditLog.class, to = Event.class) public static Event map(AuditLog entity, Event event) { Event model = event != null ? event : new Event(); - model.setId(String.valueOf(entity.getaudit_log_id())); - model.setCode(entity.getlog_type().getValue()); - model.setSeverity(map(entity.getseverity(), null).value()); + model.setId(String.valueOf(entity.getAuditLogId())); + model.setCode(entity.getLogType().getValue()); + model.setSeverity(map(entity.getSeverity(), null).value()); model.setTime(TypeConversionHelper.toXMLGregorianCalendar(entity - .getlog_time(), null)); - model.setDescription(entity.getmessage()); + .getLogTime(), null)); + model.setDescription(entity.getMessage()); - if (entity.getuser_id() != null - && !entity.getuser_id().equals(Guid.Empty)) { + if (entity.getUserId() != null + && !entity.getUserId().equals(Guid.Empty)) { User user = new User(); - user.setId(entity.getuser_id().toString()); + user.setId(entity.getUserId().toString()); model.setUser(user); } - if (entity.getvm_id() != null && !entity.getvm_id().equals(Guid.Empty)) { + if (entity.getVmId() != null && !entity.getVmId().equals(Guid.Empty)) { VM vm = new VM(); - vm.setId(entity.getvm_id().toString()); + vm.setId(entity.getVmId().toString()); model.setVm(vm); } - if (entity.getstorage_domain_id() != null - && !entity.getstorage_domain_id().equals(Guid.Empty)) { + if (entity.getStorageDomainId() != null + && !entity.getStorageDomainId().equals(Guid.Empty)) { StorageDomain sd = new StorageDomain(); - sd.setId(entity.getstorage_domain_id().toString()); + sd.setId(entity.getStorageDomainId().toString()); model.setStorageDomain(sd); } - if (entity.getvds_id() != null - && !entity.getvds_id().equals(Guid.Empty)) { + if (entity.getVdsId() != null + && !entity.getVdsId().equals(Guid.Empty)) { Host host = new Host(); - host.setId(entity.getvds_id().toString()); + host.setId(entity.getVdsId().toString()); model.setHost(host); } - if (entity.getvm_template_id() != null - && !entity.getvm_template_id().equals(Guid.Empty)) { + if (entity.getVmTemplateId() != null + && !entity.getVmTemplateId().equals(Guid.Empty)) { Template template = new Template(); - template.setId(entity.getvm_template_id().toString()); + template.setId(entity.getVmTemplateId().toString()); model.setTemplate(template); } - if (entity.getvds_group_id() != null - && !entity.getvds_group_id().equals(Guid.Empty)) { + if (entity.getVdsGroupId() != null + && !entity.getVdsGroupId().equals(Guid.Empty)) { Cluster cluster = new Cluster(); - cluster.setId(entity.getvds_group_id().toString()); + cluster.setId(entity.getVdsGroupId().toString()); model.setCluster(cluster); } - if (entity.getstorage_pool_id() != null - && !entity.getstorage_pool_id().equals(Guid.Empty)) { + if (entity.getStoragePoolId() != null + && !entity.getStoragePoolId().equals(Guid.Empty)) { DataCenter dataCenter = new DataCenter(); - dataCenter.setId(entity.getstorage_pool_id().toString()); + dataCenter.setId(entity.getStoragePoolId().toString()); model.setDataCenter(dataCenter); } if (StringUtils.isNotEmpty(entity.getCorrelationId())) { @@ -89,37 +89,37 @@ @Mapping(from = Event.class, to = AuditLog.class) public static AuditLog map(Event event, AuditLog entity) { AuditLog auditLog = (entity != null) ? entity : new AuditLog(); - auditLog.setseverity(map(event.getSeverity(), null)); - auditLog.setlog_time(event.isSetTime() ? event.getTime().toGregorianCalendar().getTime() + auditLog.setSeverity(map(event.getSeverity(), null)); + auditLog.setLogTime(event.isSetTime() ? event.getTime().toGregorianCalendar().getTime() : new Date((Calendar.getInstance().getTimeInMillis()))); - auditLog.setmessage(event.getDescription()); + auditLog.setMessage(event.getDescription()); Guid guid = (event.isSetUser()) ? GuidUtils.asGuid(event.getUser().getId()) : Guid.Empty; if (!guid.equals(Guid.Empty)) { - auditLog.setuser_id(guid); + auditLog.setUserId(guid); } guid = (event.isSetVm()) ? GuidUtils.asGuid(event.getVm().getId()) : Guid.Empty; if (!guid.equals(Guid.Empty)) { - auditLog.setvm_id(guid); + auditLog.setVmId(guid); } guid = (event.isSetStorageDomain()) ? GuidUtils.asGuid(event.getStorageDomain().getId()) : Guid.Empty; if (!guid.equals(Guid.Empty)) { - auditLog.setstorage_domain_id(guid); + auditLog.setStorageDomainId(guid); } guid = (event.isSetHost()) ? GuidUtils.asGuid(event.getHost().getId()) : Guid.Empty; if (!guid.equals(Guid.Empty)) { - auditLog.setvds_id(guid); + auditLog.setVdsId(guid); } guid = (event.isSetTemplate()) ? GuidUtils.asGuid(event.getTemplate().getId()) : Guid.Empty; if (!guid.equals(Guid.Empty)) { - auditLog.setvm_template_id(guid); + auditLog.setVmTemplateId(guid); } guid = (event.isSetCluster()) ? GuidUtils.asGuid(event.getCluster().getId()) : Guid.Empty; if (!guid.equals(Guid.Empty)) { - auditLog.setvds_group_id(guid); + auditLog.setVdsGroupId(guid); } guid = (event.isSetDataCenter()) ? GuidUtils.asGuid(event.getDataCenter().getId()) : Guid.Empty; if (!guid.equals(Guid.Empty)) { - auditLog.setstorage_pool_id(guid); + auditLog.setStoragePoolId(guid); } if (event.isSetCorrelationId()) { auditLog.setCorrelationId(event.getCorrelationId()); diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java index 3ed4d4d..aab2d12 100644 --- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java +++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java @@ -134,7 +134,7 @@ @Override protected void auditLog(AuditLogableBase auditLogable, AuditLogType logType) { AuditLog al = new AuditLog(); - al.setlog_type(logType); + al.setLogType(logType); mockAuditLogDao.save(al); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AuditLogSeverityColumn.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AuditLogSeverityColumn.java index 1d3fab0..3c818b0 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AuditLogSeverityColumn.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AuditLogSeverityColumn.java @@ -11,7 +11,7 @@ @Override public ImageResource getValue(AuditLog log) { - switch (log.getseverity()) { + switch (log.getSeverity()) { case NORMAL: return getCommonResources().logNormalImage(); case WARNING: diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/events/EventListModelTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/events/EventListModelTable.java index 53fb02e..ef38a5d 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/events/EventListModelTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/events/EventListModelTable.java @@ -38,7 +38,7 @@ TextColumnWithTooltip<AuditLog> logTimeColumn = new FullDateTimeColumn<AuditLog>() { @Override protected Date getRawValue(AuditLog object) { - return object.getlog_time(); + return object.getLogTime(); } }; logTimeColumn.makeSortable(AuditLogConditionFieldAutoCompleter.TIME); @@ -47,7 +47,7 @@ TextColumnWithTooltip<AuditLog> messageColumn = new TextColumnWithTooltip<AuditLog>() { @Override public String getValue(AuditLog object) { - return object.getmessage(); + return object.getMessage(); } }; messageColumn.makeSortable(AuditLogConditionFieldAutoCompleter.MESSAGE); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java index cd0114a..59b1d65 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java @@ -81,8 +81,8 @@ @Override public int compare(AuditLog x, AuditLog y) { - long xid = x.getaudit_log_id(); - long yid = y.getaudit_log_id(); + long xid = x.getAuditLogId(); + long yid = y.getAuditLogId(); return Long.valueOf(xid).compareTo(yid); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/AlertListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/AlertListModel.java index a53d7c9..e22e1a8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/AlertListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/AlertListModel.java @@ -86,7 +86,7 @@ public void dismissAlert() { AuditLog auditLog = (AuditLog) getSelectedItem(); - RemoveAuditLogByIdParameters params = new RemoveAuditLogByIdParameters(auditLog.getaudit_log_id()); + RemoveAuditLogByIdParameters params = new RemoveAuditLogByIdParameters(auditLog.getAuditLogId()); Frontend.getInstance().runAction(VdcActionType.RemoveAuditLogById, params); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java index cbd6f55..a78a510 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java @@ -172,7 +172,7 @@ SearchParameters params = new SearchParameters(applySortOptions(getSearchString()), SearchType.AuditLog, isCaseSensitiveSearch()); params.setMaxCount(getSearchPageSize()); - params.setSearchFrom(getLastEvent() != null ? getLastEvent().getaudit_log_id() : 0); + params.setSearchFrom(getLastEvent() != null ? getLastEvent().getAuditLogId() : 0); params.setRefresh(false); Frontend.getInstance().runQuery(VdcQueryType.Search, params, query); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java index 49f0c72..085857f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java @@ -123,7 +123,7 @@ // Event else if (businessEntity instanceof AuditLog) { obj.setValueAsString("correlationId", ((AuditLog) businessEntity).getCorrelationId()); //$NON-NLS-1$ - obj.setValueAsString("message", ((AuditLog) businessEntity).getmessage()); //$NON-NLS-1$ + obj.setValueAsString("message", ((AuditLog) businessEntity).getMessage()); //$NON-NLS-1$ obj.setValueAsString("callStack", ((AuditLog) businessEntity).getCallStack()); //$NON-NLS-1$ obj.setValueAsString("customEventId", String.valueOf(((AuditLog) businessEntity).getCustomEventId())); //$NON-NLS-1$ obj.setValueAsString("toString", ((AuditLog) businessEntity).toStringForLogging()); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/event/EventPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/event/EventPopupView.java index 6edb2bb..0010e7c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/event/EventPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/event/EventPopupView.java @@ -78,9 +78,9 @@ driver.edit(eventModel); AuditLog event = eventModel.getEvent(); - eventIdLabel.asValueBox().setValue(String.valueOf(event.getlog_typeValue())); - eventTimeLabel.asValueBox().setValue(new FullDateTimeRenderer().render(event.getlog_time())); - eventMessageTextArea.asValueBox().setValue(event.getmessage()); + eventIdLabel.asValueBox().setValue(String.valueOf(event.getLogTypeValue())); + eventTimeLabel.asValueBox().setValue(new FullDateTimeRenderer().render(event.getLogTime())); + eventMessageTextArea.asValueBox().setValue(event.getMessage()); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java index 424fee3..f8ff869 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java @@ -121,7 +121,7 @@ TextColumnWithTooltip<AuditLog> logTimeColumn = new FullDateTimeColumn<AuditLog>() { @Override protected Date getRawValue(AuditLog object) { - return object.getlog_time(); + return object.getLogTime(); } }; logTimeColumn.makeSortable(AuditLogConditionFieldAutoCompleter.TIME); @@ -130,7 +130,7 @@ messageColumn = new TextColumnWithTooltip<AuditLog>() { @Override public String getValue(AuditLog object) { - return object.getmessage(); + return object.getMessage(); } }; messageColumn.makeSortable(AuditLogConditionFieldAutoCompleter.MESSAGE); @@ -152,7 +152,7 @@ public static final TextColumnWithTooltip<AuditLog> logTypeColumn = new TextColumnWithTooltip<AuditLog>() { @Override public String getValue(AuditLog object) { - return String.valueOf(object.getlog_typeValue()); + return String.valueOf(object.getLogTypeValue()); } }; @@ -163,7 +163,7 @@ @Override public String getValue(AuditLog object) { - return object.getuser_name(); + return object.getUserName(); } }; @@ -174,7 +174,7 @@ @Override public String getValue(AuditLog object) { - return object.getvds_name(); + return object.getVdsName(); } }; @@ -185,7 +185,7 @@ @Override public String getValue(AuditLog object) { - return object.getvm_name(); + return object.getVmName(); } }; @@ -196,7 +196,7 @@ @Override public String getValue(AuditLog object) { - return object.getvm_template_name(); + return object.getVmTemplateName(); } }; @@ -207,7 +207,7 @@ @Override public String getValue(AuditLog object) { - return object.getstorage_pool_name(); + return object.getStoragePoolName(); } }; @@ -218,14 +218,14 @@ @Override public String getValue(AuditLog object) { - return object.getstorage_domain_name(); + return object.getStorageDomainName(); } }; public static final TextColumnWithTooltip<AuditLog> clusterColumn = new TextColumnWithTooltip<AuditLog>() { @Override public String getValue(AuditLog object) { - return object.getvds_group_name(); + return object.getVdsGroupName(); } }; diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/AlertsEventsFooterView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/AlertsEventsFooterView.java index 34b4beb..40eb086 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/AlertsEventsFooterView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/AlertsEventsFooterView.java @@ -367,7 +367,7 @@ TextColumnWithTooltip<AuditLog> logTimeColumn = new FullDateTimeColumn<AuditLog>() { @Override protected Date getRawValue(AuditLog object) { - return object.getlog_time(); + return object.getLogTime(); } }; table.addColumn(logTimeColumn, constants.timeEvent(), "160px"); //$NON-NLS-1$ @@ -375,7 +375,7 @@ TextColumnWithTooltip<AuditLog> messageColumn = new TextColumnWithTooltip<AuditLog>() { @Override public String getValue(AuditLog object) { - return object.getmessage(); + return object.getMessage(); } }; table.addColumn(messageColumn, constants.messageEvent()); @@ -387,7 +387,7 @@ TextColumnWithTooltip<AuditLog> logTimeColumn = new FullDateTimeColumn<AuditLog>() { @Override protected Date getRawValue(AuditLog object) { - return object.getlog_time(); + return object.getLogTime(); } }; table.addColumn(logTimeColumn, constants.timeEvent(), "160px"); //$NON-NLS-1$ @@ -397,7 +397,7 @@ TextColumnWithTooltip<AuditLog> messageColumn = new TextColumnWithTooltip<AuditLog>() { @Override public String getValue(AuditLog object) { - return object.getmessage(); + return object.getMessage(); } }; table.addColumn(messageColumn, constants.messageEvent()); -- To view, visit http://gerrit.ovirt.org/34756 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idbc05cd0006737d8ff0c923ab2b6aae18389de90 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
