Michael Kublin has uploaded a new change for review. Change subject: engine: Removing CustomLogField annotation ......................................................................
engine: Removing CustomLogField annotation The following annotation is not required, the uses of this annotation is not required. The annotation is removed, from now code look like regular java-style code Change-Id: I8a520707c979ab6b9ce479398facc364515d406f 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/AuditLogHelper.java D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/CustomLogField.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/CustomLogFields.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/BaseClass.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/MultiChild.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/SingleChild.java 40 files changed, 42 insertions(+), 94 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/13527/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 a69bd1c..0650b9d 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,14 +28,13 @@ 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.CustomLogField; 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({ @CustomLogField("DiskAlias") }) +@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 b1095d9..8454f4c 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,10 +10,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("AdGroupName") }) +@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 1299855..bf4463e 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,10 +5,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("BookmarkName"), @CustomLogField("BookmarkValue") }) +@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 d8e465f..263f8cb 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,10 +8,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("DiskName") }) +@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 dbd2834..b8e23bc 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,10 +6,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("DiskName") }) +@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 b4b20b4..06e2739 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.dal.job.ExecutionMessageDirector; import org.ovirt.engine.core.utils.NameForVmInPoolGenerator; @@ -52,7 +51,7 @@ * already exists - number increased. For example if vm_8 exists - vm_9 will be created instead of it. */ -@CustomLogFields({ @CustomLogField("VmsCount") }) +@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 45ea7c4..566b546 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,10 +21,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("VdsDestination"), @CustomLogField("DueToMigrationError") }) +@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 cd76631..f2620fb 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,12 +35,11 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.dao.VmDeviceDAO; @DisableInPrepareMode -@CustomLogFields({ @CustomLogField("DiskAlias") }) +@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 9938fb0..441153a 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,10 +5,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("OldParnetTagName"), @CustomLogField("NewParentTagName") }) +@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 1ad5449..4e6d429 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,11 +10,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("RoleName"), @CustomLogField("VdcObjectType"), @CustomLogField("VdcObjectName"), - @CustomLogField("SubjectName") }) +@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 432529e..0fc4746 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,11 +9,10 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.dao.QuotaDAO; -@CustomLogFields({ @CustomLogField("QuotaName") }) +@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 2b60cbb..dacdd74 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,10 +10,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("Role") }) +@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 9dbe45e..0b1304c 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.dao.DiskDao; import org.ovirt.engine.core.dao.DiskImageDAO; @@ -51,7 +50,7 @@ import org.ovirt.engine.core.utils.transaction.TransactionSupport; @DisableInPrepareMode -@CustomLogFields({ @CustomLogField("DiskAlias") }) +@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 b02b107..55d99cd 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,10 +11,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("RoleName") }) +@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 6fd3322..736ab31 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,10 +4,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("TagName") }) +@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 03981bd..5ba16ec 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,12 +6,11 @@ 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.CustomLogField; 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({ @CustomLogField("NetworkName") }) +@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 74900c6..64a51e8 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,10 +24,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("AdUserName") }) +@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 d96c3a3..c51fc4b 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,10 +9,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("VdsGroupName") }) +@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 9220603..9a236b0 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,12 +25,11 @@ 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.CustomLogField; 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({ @CustomLogField("VmPoolName") }) +@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 4fa43ba..04c8f0e 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,10 +5,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("AdUserName") }) +@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 e233379..38bd07e 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,10 +4,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("VmPoolName") }) +@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 b978f0b..1b3358c 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,10 +15,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("DiskAlias") }) +@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 12c879b..de78579 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,12 +15,11 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.utils.NetworkUtils; @SuppressWarnings("serial") -@CustomLogFields({ @CustomLogField("NetworkName") }) +@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 4934924..1a9ec03 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,11 +17,10 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @SuppressWarnings("serial") -@CustomLogFields({ @CustomLogField("NetworkName") }) +@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 2fd5d16..210400e 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,12 +14,11 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.utils.NetworkUtils; @SuppressWarnings("serial") -@CustomLogFields({ @CustomLogField("NetworkName") }) +@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 3f30820..c048a35 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,11 +10,10 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @SuppressWarnings("serial") -@CustomLogFields({ @CustomLogField("NetworkName") }) +@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 c9f3069..15d9763 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,11 +2,10 @@ import org.ovirt.engine.core.bll.VdsCommand; import org.ovirt.engine.core.common.action.BondParametersBase; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @SuppressWarnings("serial") -@CustomLogFields({ @CustomLogField("BondName") }) +@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 4fe9286..ecdad16 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,11 +2,10 @@ import org.ovirt.engine.core.bll.VdsCommand; import org.ovirt.engine.core.common.action.AttachNetworkToVdsParameters; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @SuppressWarnings("serial") -@CustomLogFields({ @CustomLogField("NetworkName") }) +@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 b9b3848..b2262ae 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,13 +14,12 @@ 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.CustomLogField; 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({ @CustomLogField("NetworkName") }) +@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 bd142c1..8b1985f 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,11 +10,10 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @SuppressWarnings("serial") -@CustomLogFields({ @CustomLogField("InterfaceName"), @CustomLogField("InterfaceType") }) +@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 7248a38..ff6c02c 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,11 +23,10 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @SuppressWarnings("serial") -@CustomLogFields({ @CustomLogField("NetworkName"), @CustomLogField("InterfaceName") }) +@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 e9c3f10..01c8180 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.CustomLogField; 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; @@ -32,7 +31,7 @@ */ @SuppressWarnings("serial") @NonTransactiveCommandAttribute -@CustomLogFields({ @CustomLogField("InterfaceName"), @CustomLogField("InterfaceType") }) +@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 819c4ff..af6bef8 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,10 +10,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("InterfaceName") }) +@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 10e425a..b034aed 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,10 +10,9 @@ 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.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; -@CustomLogFields({ @CustomLogField("Error") }) +@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/AuditLogHelper.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogHelper.java index d790b82..342316f 100644 --- 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 @@ -23,15 +23,12 @@ } // Add any you find on this class - CustomLogField field = (CustomLogField) type.getAnnotation(CustomLogField.class); CustomLogFields fields = (CustomLogFields) type.getAnnotation(CustomLogFields.class); - Set<String> myAnnotations = new HashSet<String>(); - if (field != null) { - myAnnotations.add(field.value().toLowerCase()); - } + Set<String> myAnnotations = null; if (fields != null) { - for (CustomLogField inner : fields.value()) { - myAnnotations.add(inner.value().toLowerCase()); + myAnnotations = new HashSet<String>(); + for (String inner : fields.value()) { + myAnnotations.add(inner.toLowerCase()); } } return merge(returnValue, myAnnotations); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/CustomLogField.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/CustomLogField.java deleted file mode 100644 index a673c2e..0000000 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/CustomLogField.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 CustomLogField { - String value(); -} 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 index f01fc3d..b166651 100644 --- 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 @@ -10,5 +10,5 @@ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface CustomLogFields { - CustomLogField[] value(); + String[] value(); } 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 index 02e7bbd..93230b1 100644 --- 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 @@ -1,5 +1,5 @@ package org.ovirt.engine.core.dal.dbbroker.auditloghandling; -@CustomLogField("JarJar") +@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 index e722b85..2ea8b48 100644 --- 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 @@ -1,5 +1,5 @@ package org.ovirt.engine.core.dal.dbbroker.auditloghandling; -@CustomLogFields({ @CustomLogField("Luke"), @CustomLogField("Skywalker"), @CustomLogField("JarJar") }) +@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 index 1715b02..779610e 100644 --- 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 @@ -1,5 +1,5 @@ package org.ovirt.engine.core.dal.dbbroker.auditloghandling; -@CustomLogField("Binks") +@CustomLogFields("Binks") public class SingleChild extends BaseClass { } -- To view, visit http://gerrit.ovirt.org/13527 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a520707c979ab6b9ce479398facc364515d406f 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
