Michael Kublin has uploaded a new change for review. Change subject: engine: Removing CustomLogFields annotattion (Second super fix in AuditLogDirector) ......................................................................
engine: Removing CustomLogFields annotattion (Second super fix in AuditLogDirector) After some investigation I found out that we don't need CustomLogFields annotaattion at all, this is a best optimization which can be done here. We don't need it because of all required names of parameters are located inside our audit log message and their values will be retrieved via reflection, that's why we don't need to keep additional list of parameters names inside annotattion. Benefits: 1. Reduced number of operations for processing annotattion (Improved CPU consaption) 2. Simplified development of audit log messages, no need for annotattion. 3. Code becomes understandable for everyone (at least I hope) This is a kind of patch that I like: 1. Improved perfromance 2. Code becomes more clear 3. A lot of garbage removed Change-Id: Ied60d0000e26158baee64c83540d683093485dd8 Signed-off-by: Michael Kublin <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveTagCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QuotaCRUDCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAdGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RolesCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateDisplayToVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolSimpleUserCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolToAdGroupBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsBondCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SetStoragePoolStatusCommand.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogHelper.java D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/CustomLogFields.java D backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogHelperTest.java D backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/BaseClass.java D backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/MultiChild.java D backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/SingleChild.java 41 files changed, 0 insertions(+), 182 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/13544/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java index 0650b9d..35641b1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java @@ -28,13 +28,11 @@ import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.dao.BaseDiskDao; import org.ovirt.engine.core.dao.ImageDao; import org.ovirt.engine.core.dao.SnapshotDao; import org.ovirt.engine.core.dao.StoragePoolIsoMapDAO; -@CustomLogFields("DiskAlias") public abstract class AbstractDiskVmCommand<T extends VmDiskOperationParameterBase> extends VmCommand<T> { private static final long serialVersionUID = -4596432908703489958L; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java index 8454f4c..0406479 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java @@ -10,9 +10,7 @@ import org.ovirt.engine.core.common.businessentities.tags; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields("AdGroupName") public abstract class AdGroupsHandlingCommandBase<T extends AdElementParametersBase> extends CommandBase<T> { protected tags _tag; private LdapGroup mGroup; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java index bf4463e..ffca349 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java @@ -5,9 +5,7 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({"BookmarkName", "BookmarkValue"}) public abstract class BookmarkCommandBase<T extends BookmarksParametersBase> extends AdminOperationCommandBase<T> { private Bookmark mBookmark; private String mBookmarkName; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java index 263f8cb..2eefa73 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java @@ -8,9 +8,7 @@ import org.ovirt.engine.core.common.vdscommands.ChangeDiskVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields("DiskName") public class ChangeDiskCommand<T extends ChangeDiskCommandParameters> extends VmOperationCommandBase<T> { private String mCdImagePath; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java index b8e23bc..3fb2cc9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java @@ -6,9 +6,7 @@ import org.ovirt.engine.core.common.action.ChangeDiskCommandParameters; import org.ovirt.engine.core.common.vdscommands.ChangeDiskVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields("DiskName") public class ChangeFloppyCommand<T extends ChangeDiskCommandParameters> extends VmOperationCommandBase<T> { private String mCdImagePath; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java index 06e2739..6ad1bd8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java @@ -37,7 +37,6 @@ import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.dal.job.ExecutionMessageDirector; import org.ovirt.engine.core.utils.NameForVmInPoolGenerator; @@ -51,7 +50,6 @@ * already exists - number increased. For example if vm_8 exists - vm_9 will be created instead of it. */ -@CustomLogFields("VmsCount") public abstract class CommonVmPoolWithVmsCommand<T extends AddVmPoolWithVmsParameters> extends AddVmPoolCommand<T> implements QuotaStorageDependent { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java index 566b546..1342140 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java @@ -21,9 +21,7 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({"VdsDestination", "DueToMigrationError"}) public class MigrateVmCommand<T extends MigrateVmParameters> extends RunVmCommandBase<T> { private static final long serialVersionUID = -89419649366187512L; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java index f2620fb..3fd39a9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java @@ -35,11 +35,9 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.NGuid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.dao.VmDeviceDAO; @DisableInPrepareMode -@CustomLogFields("DiskAlias") @NonTransactiveCommandAttribute public class MoveOrCopyDiskCommand<T extends MoveOrCopyImageGroupParameters> extends MoveOrCopyImageGroupCommand<T> implements QuotaStorageDependent { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveTagCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveTagCommand.java index 441153a..c36f2b4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveTagCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveTagCommand.java @@ -5,9 +5,7 @@ import org.ovirt.engine.core.common.businessentities.tags; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ "OldParnetTagName", "NewParentTagName" }) public class MoveTagCommand<T extends MoveTagParameters> extends TagsCommandBase<T> { private String _oldParnetTagName = "[null]"; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java index 4e6d429..8020a8a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java @@ -10,9 +10,7 @@ import org.ovirt.engine.core.common.businessentities.permissions; import org.ovirt.engine.core.common.businessentities.Role; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({"RoleName", "VdcObjectType", "VdcObjectName", "SubjectName" }) public abstract class PermissionsCommandBase<T extends PermissionsOperationsParametes> extends CommandBase<T> { private static final long serialVersionUID = -2515073672998232982L; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QuotaCRUDCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QuotaCRUDCommand.java index 0fc4746..d2cf26c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QuotaCRUDCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QuotaCRUDCommand.java @@ -9,10 +9,8 @@ import org.ovirt.engine.core.common.businessentities.QuotaVdsGroup; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.dao.QuotaDAO; -@CustomLogFields("QuotaName") public abstract class QuotaCRUDCommand extends CommandBase<QuotaCRUDParameters> { private Quota quota; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAdGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAdGroupCommand.java index dacdd74..4c518e6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAdGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAdGroupCommand.java @@ -10,9 +10,7 @@ import org.ovirt.engine.core.common.businessentities.permissions; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields("Role") public class RemoveAdGroupCommand<T extends AdElementParametersBase> extends AdGroupsHandlingCommandBase<T> { private static final long serialVersionUID = 250036567105148334L; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java index 0b1304c..2c2393c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java @@ -42,7 +42,6 @@ import org.ovirt.engine.core.compat.TransactionScopeOption; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.dao.DiskDao; import org.ovirt.engine.core.dao.DiskImageDAO; import org.ovirt.engine.core.dao.VmDeviceDAO; @@ -50,7 +49,6 @@ import org.ovirt.engine.core.utils.transaction.TransactionSupport; @DisableInPrepareMode -@CustomLogFields("DiskAlias") @LockIdNameAttribute(isReleaseAtEndOfExecute = false) @NonTransactiveCommandAttribute public class RemoveDiskCommand<T extends RemoveDiskParameters> extends CommandBase<T> diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RolesCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RolesCommandBase.java index 55d99cd..f806439 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RolesCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RolesCommandBase.java @@ -11,9 +11,7 @@ import org.ovirt.engine.core.common.businessentities.Role; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields("RoleName") public abstract class RolesCommandBase<T extends RolesParameterBase> extends CommandBase<T> { private static final long serialVersionUID = -5335986165541561251L; private Role _role; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsCommandBase.java index 736ab31..406bc69 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsCommandBase.java @@ -4,9 +4,7 @@ import org.ovirt.engine.core.common.businessentities.tags; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields("TagName") public abstract class TagsCommandBase<T extends TagsActionParametersBase> extends AdminOperationCommandBase<T> { private tags mTag = null; protected boolean noActionDone = true; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateDisplayToVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateDisplayToVdsGroupCommand.java index 5ba16ec..69cd6c5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateDisplayToVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateDisplayToVdsGroupCommand.java @@ -6,11 +6,9 @@ import org.ovirt.engine.core.common.action.DisplayNetworkToVdsGroupParameters; import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; -@CustomLogFields("NetworkName") public class UpdateDisplayToVdsGroupCommand<T extends DisplayNetworkToVdsGroupParameters> extends VdsGroupCommandBase<T> { private NetworkCluster _networkCluster; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java index 64a51e8..e485908 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java @@ -24,9 +24,7 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields("AdUserName") public abstract class UserCommandBase<T extends AdElementParametersBase> extends CommandBase<T> { public UserCommandBase() { } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupCommandBase.java index c51fc4b..49092b7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupCommandBase.java @@ -9,9 +9,7 @@ import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields("VdsGroupName") public abstract class VdsGroupCommandBase<T extends VdsGroupParametersBase> extends CommandBase<T> { private VDSGroup _vdsGroup; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java index 9a236b0..08b652f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java @@ -25,11 +25,9 @@ import org.ovirt.engine.core.compat.NGuid; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.dao.VmPoolDAO; import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils; -@CustomLogFields("VmPoolName") public abstract class VmPoolCommandBase<T extends VmPoolParametersBase> extends CommandBase<T> { private VmPool mVmPool; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolSimpleUserCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolSimpleUserCommandBase.java index 04c8f0e..7ddd76b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolSimpleUserCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolSimpleUserCommandBase.java @@ -5,9 +5,7 @@ import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields("AdUserName") public abstract class VmPoolSimpleUserCommandBase<T extends VmPoolSimpleUserParameters> extends VmPoolCommandBase<T> { /** diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolToAdGroupBaseCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolToAdGroupBaseCommand.java index 38bd07e..e03c18e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolToAdGroupBaseCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolToAdGroupBaseCommand.java @@ -4,9 +4,7 @@ import org.ovirt.engine.core.common.businessentities.VmPool; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields("VmPoolName") public abstract class VmPoolToAdGroupBaseCommand<T extends VmPoolToAdElementParameters> extends AdGroupsHandlingCommandBase<T> { private VmPool mVmPool; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java index 1b3358c..bb29f21 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java @@ -15,9 +15,7 @@ import org.ovirt.engine.core.common.asynctasks.AsyncTaskCreationInfo; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields("DiskAlias") @NonTransactiveCommandAttribute public class LiveMigrateDiskCommand<T extends LiveMigrateDiskParameters> extends MoveOrCopyDiskCommand<T> implements TaskHandlerCommand<LiveMigrateDiskParameters> { private static final long serialVersionUID = -6216729539906812205L; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java index de78579..fef809a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java @@ -15,11 +15,9 @@ import org.ovirt.engine.core.common.businessentities.network.NetworkStatus; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.utils.NetworkUtils; @SuppressWarnings("serial") -@CustomLogFields("NetworkName") public class AttachNetworkToVdsGroupCommand<T extends AttachNetworkToVdsGroupParameter> extends VdsGroupCommandBase<T> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java index 1a9ec03..9a98a64 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java @@ -17,10 +17,8 @@ import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @SuppressWarnings("serial") -@CustomLogFields("NetworkName") public class DetachNetworkToVdsGroupCommand<T extends AttachNetworkToVdsGroupParameter> extends VdsGroupCommandBase<T> { public DetachNetworkToVdsGroupCommand(T parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java index 210400e..bbe9ae2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/UpdateNetworkOnClusterCommand.java @@ -14,11 +14,9 @@ import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.utils.NetworkUtils; @SuppressWarnings("serial") -@CustomLogFields("NetworkName") public class UpdateNetworkOnClusterCommand<T extends NetworkClusterParameters> extends VdsGroupCommandBase<T> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java index c048a35..b245342 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java @@ -10,10 +10,8 @@ import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @SuppressWarnings("serial") -@CustomLogFields("NetworkName") public abstract class NetworkCommon<T extends AddNetworkStoragePoolParameters> extends CommandBase<T> { public NetworkCommon(T parameters) { super(parameters); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsBondCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsBondCommand.java index 15d9763..64b9baf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsBondCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsBondCommand.java @@ -2,10 +2,8 @@ import org.ovirt.engine.core.bll.VdsCommand; import org.ovirt.engine.core.common.action.BondParametersBase; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @SuppressWarnings("serial") -@CustomLogFields("BondName") public abstract class VdsBondCommand<T extends BondParametersBase> extends VdsCommand<T> { public VdsBondCommand(T parameters) { super(parameters); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsNetworkCommand.java index ecdad16..b0ae2af 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsNetworkCommand.java @@ -2,10 +2,8 @@ import org.ovirt.engine.core.bll.VdsCommand; import org.ovirt.engine.core.common.action.AttachNetworkToVdsParameters; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @SuppressWarnings("serial") -@CustomLogFields("NetworkName") public abstract class VdsNetworkCommand<T extends AttachNetworkToVdsParameters> extends VdsCommand<T> { public VdsNetworkCommand(T parameters) { super(parameters); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java index b2262ae..b062cbf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java @@ -14,12 +14,10 @@ import org.ovirt.engine.core.common.validation.group.UpdateEntity; import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; @SuppressWarnings("serial") -@CustomLogFields("NetworkName") public class UpdateVmTemplateInterfaceCommand<T extends AddVmTemplateInterfaceParameters> extends VmTemplateInterfaceCommandBase<T> { public UpdateVmTemplateInterfaceCommand(T parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java index 8b1985f..1c7b655 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java @@ -10,10 +10,8 @@ import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @SuppressWarnings("serial") -@CustomLogFields({ "InterfaceName", "InterfaceType" }) public abstract class VmTemplateInterfaceCommandBase<T extends AddVmTemplateInterfaceParameters> extends VmTemplateCommand<T> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java index ff6c02c..713af99 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java @@ -23,10 +23,8 @@ import org.ovirt.engine.core.common.utils.ValidationUtils; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @SuppressWarnings("serial") -@CustomLogFields({ "NetworkName", "InterfaceName" }) public abstract class AbstractVmInterfaceCommand<T extends AddVmInterfaceParameters> extends VmCommand<T> { public AbstractVmInterfaceCommand(T parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java index 01c8180..6dfabb9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java @@ -20,7 +20,6 @@ import org.ovirt.engine.core.common.vdscommands.VmNicDeviceVDSParameters; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.dao.network.InterfaceDao; import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; @@ -31,7 +30,6 @@ */ @SuppressWarnings("serial") @NonTransactiveCommandAttribute -@CustomLogFields({ "InterfaceName", "InterfaceType" }) public class ActivateDeactivateVmNicCommand<T extends ActivateDeactivateVmNicParameters> extends VmCommand<T> { private VmDevice vmDevice; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java index af6bef8..f09107d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java @@ -10,9 +10,7 @@ import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields("InterfaceName") public class RemoveVmInterfaceCommand<T extends RemoveVmInterfaceParameters> extends VmCommand<T> { private static final long serialVersionUID = 997624605993881039L; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SetStoragePoolStatusCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SetStoragePoolStatusCommand.java index b034aed..ca4398a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SetStoragePoolStatusCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/SetStoragePoolStatusCommand.java @@ -10,9 +10,7 @@ import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields("Error") public class SetStoragePoolStatusCommand<T extends SetStoragePoolStatusParameters> extends StorageHandlingCommandBase<T> { public SetStoragePoolStatusCommand(T parameters) { 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 fa4b14a..763b3c2 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 @@ -981,7 +981,6 @@ private static Map<String, String> getAvailableValues(String message, AuditLogableBase logable) { Map<String, String> returnValue = new HashMap<String, String>(logable.getCustomValues()); Set<String> attributes = resolvePlaceHolders(message); - attributes = AuditLogHelper.merge(attributes, AuditLogHelper.getCustomLogFields(logable.getClass(), true)); if (attributes != null && attributes.size() > 0) { TypeCompat.getPropertyValues(logable, attributes, returnValue); } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogHelper.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogHelper.java deleted file mode 100644 index 342316f..0000000 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogHelper.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.ovirt.engine.core.dal.dbbroker.auditloghandling; - -import java.util.HashSet; -import java.util.Set; - -public class AuditLogHelper { - - public static Set<String> getCustomLogFields(Class<?> type, boolean inherit) { - Set<String> returnValue = null; - - // Look for inherited ones - if (inherit) { - Class<?>[] interfaces = type.getInterfaces(); - Class<?> superClass = type.getSuperclass(); - if (superClass != null) { - returnValue = getCustomLogFields(superClass, true); - } - for (Class<?> clazz : interfaces) { - if (!clazz.equals(type)) { - returnValue = merge(returnValue, getCustomLogFields(clazz, true)); - } - } - } - - // Add any you find on this class - CustomLogFields fields = (CustomLogFields) type.getAnnotation(CustomLogFields.class); - Set<String> myAnnotations = null; - if (fields != null) { - myAnnotations = new HashSet<String>(); - for (String inner : fields.value()) { - myAnnotations.add(inner.toLowerCase()); - } - } - return merge(returnValue, myAnnotations); - } - - public static <T> Set<T> merge(Set<T> list, Set<T> items) { - if (list != null) { - if (items != null) { - list.addAll(items); - } - } else { - return items; - } - return list; - } -} diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/CustomLogFields.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/CustomLogFields.java deleted file mode 100644 index b166651..0000000 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/CustomLogFields.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.ovirt.engine.core.dal.dbbroker.auditloghandling; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface CustomLogFields { - String[] value(); -} diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogHelperTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogHelperTest.java deleted file mode 100644 index bdc4252..0000000 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogHelperTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.ovirt.engine.core.dal.dbbroker.auditloghandling; - -import java.util.Set; - -import junit.framework.TestCase; - -public class AuditLogHelperTest extends TestCase { - public void testSimple() { - Set<String> array = AuditLogHelper.getCustomLogFields(BaseClass.class, true); - assertEquals("size should be 1", 1, array.size()); - array = AuditLogHelper.getCustomLogFields(BaseClass.class, false); - assertEquals("Not Inherited size should be 1", 1, array.size()); - } - - public void testSingleChild() { - Set<String> array = AuditLogHelper.getCustomLogFields(SingleChild.class, true); - assertEquals("size should be 2", 2, array.size()); - assertTrue("Parent Attribute", array.contains("jarjar")); - assertTrue("Child Attribute", array.contains("binks")); - array = AuditLogHelper.getCustomLogFields(SingleChild.class, false); - assertEquals("Not inherited size should be 1", 1, array.size()); - assertTrue("Not Inhertied Child Attribute", array.contains("binks")); - } - - public void testMultiChild() { - Set<String> array = AuditLogHelper.getCustomLogFields(MultiChild.class, true); - assertEquals("size should be 3", 3, array.size()); - assertTrue("Parent Attribute", array.contains("jarjar")); - assertTrue("Child Attribute", array.contains("luke")); - assertTrue("Child Attribute", array.contains("skywalker")); - array = AuditLogHelper.getCustomLogFields(MultiChild.class, false); - assertEquals("Not Inherited size should be 3", 3, array.size()); - assertTrue("Not Inherited Child Attribute", array.contains("luke")); - assertTrue("Not Inherited Child Attribute", array.contains("skywalker")); - assertTrue("Not Inherited Parent Attribute", array.contains("jarjar")); - } -} diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/BaseClass.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/BaseClass.java deleted file mode 100644 index 93230b1..0000000 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/BaseClass.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.ovirt.engine.core.dal.dbbroker.auditloghandling; - -@CustomLogFields("JarJar") -public class BaseClass { -} diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/MultiChild.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/MultiChild.java deleted file mode 100644 index 2ea8b48..0000000 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/MultiChild.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.ovirt.engine.core.dal.dbbroker.auditloghandling; - -@CustomLogFields({ "Luke", "Skywalker", "JarJar" }) -public class MultiChild extends BaseClass { -} diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/SingleChild.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/SingleChild.java deleted file mode 100644 index 779610e..0000000 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/SingleChild.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.ovirt.engine.core.dal.dbbroker.auditloghandling; - -@CustomLogFields("Binks") -public class SingleChild extends BaseClass { -} -- To view, visit http://gerrit.ovirt.org/13544 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied60d0000e26158baee64c83540d683093485dd8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
