Allon Mureinik has uploaded a new change for review. Change subject: core: FQCN imports in the bll project ......................................................................
core: FQCN imports in the bll project Replaced the remaining * imports in the bll project with FQCN imports. Change-Id: I988e31a8e2c5eae783d528dab16dbdf356aef260 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EvenlyDistributeComparer.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceQueryBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllBookmarksQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllServerCpuListQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllTagsQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVdsGroupsQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableClusterVersionsByStoragePoolQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionByIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionByRoleIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByNameQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRootTagQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagNameQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByUserGroupIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByVdsIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByVmIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsGroupByVdsGroupIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandlersFactory.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmTemlateWithSameNameExistQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MemoryVdsComparer.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PowerSaveComparer.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsComparer.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperation.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperationFactory.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperationFactory.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectSingleAsyncOperationFactory.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainsMultipleActionRunner.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DiscoverSendTargetsQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainByIdAndStoragePoolIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStoragePoolsByStorageDomainIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageServerConnectionByIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperationFactory.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainsByTypeComparer.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetTimeZonesQueryTest.java 36 files changed, 85 insertions(+), 66 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/14805/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EvenlyDistributeComparer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EvenlyDistributeComparer.java index 48c9ed5..13e5356 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EvenlyDistributeComparer.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EvenlyDistributeComparer.java @@ -1,6 +1,8 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.businessentities.*; +import org.ovirt.engine.core.common.businessentities.VDS; +import org.ovirt.engine.core.common.businessentities.VM; +import org.ovirt.engine.core.common.businessentities.VdsSpmStatus; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceQueryBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceQueryBase.java index 506512d..ba1f8dd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceQueryBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceQueryBase.java @@ -1,9 +1,10 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.compat.*; -import org.ovirt.engine.core.common.*; -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.dal.dbbroker.auditloghandling.*; +import org.ovirt.engine.core.common.AuditLogType; +import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; +import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AlertDirector; +import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; public abstract class FenceQueryBase<P extends VdcQueryParametersBase> extends QueriesCommandBase<P> { protected FenceQueryBase(P parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllBookmarksQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllBookmarksQuery.java index bf022ba..33ee6fe 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllBookmarksQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllBookmarksQuery.java @@ -1,7 +1,7 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.dal.dbbroker.*; +import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class GetAllBookmarksQuery<P extends VdcQueryParametersBase> extends QueriesCommandBase<P> { public GetAllBookmarksQuery(P parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllServerCpuListQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllServerCpuListQuery.java index e89b86d..6f01899 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllServerCpuListQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllServerCpuListQuery.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.queries.*; +import org.ovirt.engine.core.common.queries.GetAllServerCpuListParameters; //class CanDoActionQuery : QueriesCommandBase //{ diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllTagsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllTagsQuery.java index 69dcd15..3fcb725 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllTagsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllTagsQuery.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.queries.*; +import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; public class GetAllTagsQuery<P extends VdcQueryParametersBase> extends QueriesCommandBase<P> { public GetAllTagsQuery(P parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVdsGroupsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVdsGroupsQuery.java index 0413fc7..8eb9821 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVdsGroupsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVdsGroupsQuery.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.queries.*; +import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; public class GetAllVdsGroupsQuery<P extends VdcQueryParametersBase> extends QueriesCommandBase<P> { public GetAllVdsGroupsQuery(P parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableClusterVersionsByStoragePoolQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableClusterVersionsByStoragePoolQuery.java index 01acc92..927a61d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableClusterVersionsByStoragePoolQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableClusterVersionsByStoragePoolQuery.java @@ -1,11 +1,11 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.compat.*; -import org.ovirt.engine.core.common.businessentities.*; +import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.dal.dbbroker.*; +import org.ovirt.engine.core.common.queries.GetAvailableClusterVersionsByStoragePoolParameters; +import org.ovirt.engine.core.compat.Version; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class GetAvailableClusterVersionsByStoragePoolQuery<P extends GetAvailableClusterVersionsByStoragePoolParameters> extends QueriesCommandBase<P> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionByIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionByIdQuery.java index cb27bca..52f1bff 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionByIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionByIdQuery.java @@ -1,7 +1,7 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.dal.dbbroker.*; +import org.ovirt.engine.core.common.queries.MultilevelAdministrationByPermissionIdParameters; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class GetPermissionByIdQuery<P extends MultilevelAdministrationByPermissionIdParameters> extends QueriesCommandBase<P> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionByRoleIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionByRoleIdQuery.java index 46e09be..70e715e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionByRoleIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionByRoleIdQuery.java @@ -1,7 +1,7 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.dal.dbbroker.*; +import org.ovirt.engine.core.common.queries.MultilevelAdministrationByRoleIdParameters; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class GetPermissionByRoleIdQuery<P extends MultilevelAdministrationByRoleIdParameters> extends QueriesCommandBase<P> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByIdQuery.java index 2f4f7e6..64bcbcb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByIdQuery.java @@ -1,7 +1,7 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.dal.dbbroker.*; +import org.ovirt.engine.core.common.queries.MultilevelAdministrationByRoleIdParameters; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class GetRoleByIdQuery<P extends MultilevelAdministrationByRoleIdParameters> extends QueriesCommandBase<P> { public GetRoleByIdQuery(P parameters) diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByNameQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByNameQuery.java index b5e173a..9b3afcc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByNameQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByNameQuery.java @@ -1,7 +1,7 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.dal.dbbroker.*; +import org.ovirt.engine.core.common.queries.MultilevelAdministrationByRoleNameParameters; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class GetRoleByNameQuery<P extends MultilevelAdministrationByRoleNameParameters> extends QueriesCommandBase<P> { public GetRoleByNameQuery(P parameters) diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRootTagQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRootTagQuery.java index 29dfa26..55662d8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRootTagQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRootTagQuery.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.queries.*; +import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; public class GetRootTagQuery<P extends VdcQueryParametersBase> extends QueriesCommandBase<P> { public GetRootTagQuery(P parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagIdQuery.java index 0050810..63590bb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagIdQuery.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.queries.*; +import org.ovirt.engine.core.common.queries.GetTagByTagIdParameters; public class GetTagByTagIdQuery<P extends GetTagByTagIdParameters> extends QueriesCommandBase<P> { public GetTagByTagIdQuery(P parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagNameQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagNameQuery.java index 206bfd6..0b2016c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagNameQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagNameQuery.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.queries.*; +import org.ovirt.engine.core.common.queries.GetTagByTagNameParameters; public class GetTagByTagNameQuery<P extends GetTagByTagNameParameters> extends QueriesCommandBase<P> { public GetTagByTagNameQuery(P parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByUserGroupIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByUserGroupIdQuery.java index 74b7a36..0f4c02d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByUserGroupIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByUserGroupIdQuery.java @@ -1,7 +1,7 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.dal.dbbroker.*; -import org.ovirt.engine.core.common.queries.*; +import org.ovirt.engine.core.common.queries.GetTagsByUserGroupIdParameters; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class GetTagsByUserGroupIdQuery<P extends GetTagsByUserGroupIdParameters> extends QueriesCommandBase<P> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByVdsIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByVdsIdQuery.java index f604a01..e959172 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByVdsIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByVdsIdQuery.java @@ -1,7 +1,7 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.dal.dbbroker.*; -import org.ovirt.engine.core.common.queries.*; +import org.ovirt.engine.core.common.queries.GetTagsByVdsIdParameters; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class GetTagsByVdsIdQuery<P extends GetTagsByVdsIdParameters> extends QueriesCommandBase<P> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByVmIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByVmIdQuery.java index 6f74633..7f4f350 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByVmIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagsByVmIdQuery.java @@ -1,7 +1,7 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.dal.dbbroker.*; -import org.ovirt.engine.core.common.queries.*; +import org.ovirt.engine.core.common.queries.GetTagsByVmIdParameters; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class GetTagsByVmIdQuery<P extends GetTagsByVmIdParameters> extends QueriesCommandBase<P> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java index a872672..84f8468 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.queries.*; +import org.ovirt.engine.core.common.queries.GetTasksStatusesByTasksIDsParameters; public class GetTasksStatusesByTasksIDsQuery<P extends GetTasksStatusesByTasksIDsParameters> extends QueriesCommandBase<P> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsGroupByVdsGroupIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsGroupByVdsGroupIdQuery.java index 865bc0b..831abc5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsGroupByVdsGroupIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsGroupByVdsGroupIdQuery.java @@ -1,7 +1,7 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.dal.dbbroker.*; +import org.ovirt.engine.core.common.queries.GetVdsGroupByVdsGroupIdParameters; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class GetVdsGroupByVdsGroupIdQuery<P extends GetVdsGroupByVdsGroupIdParameters> extends QueriesCommandBase<P> { public GetVdsGroupByVdsGroupIdQuery(P parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandlersFactory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandlersFactory.java index 325cd9c..2403745 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandlersFactory.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandlersFactory.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.interfaces.*; +import org.ovirt.engine.core.common.interfaces.ITagsHandler; public final class HandlersFactory { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmTemlateWithSameNameExistQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmTemlateWithSameNameExistQuery.java index b48b074..e6b4f78 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmTemlateWithSameNameExistQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmTemlateWithSameNameExistQuery.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.queries.*; +import org.ovirt.engine.core.common.queries.IsVmTemlateWithSameNameExistParameters; public class IsVmTemlateWithSameNameExistQuery<P extends IsVmTemlateWithSameNameExistParameters> extends QueriesCommandBase<P> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MemoryVdsComparer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MemoryVdsComparer.java index 2d60f75..a600e45 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MemoryVdsComparer.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MemoryVdsComparer.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.businessentities.*; +import org.ovirt.engine.core.common.businessentities.VDS; +import org.ovirt.engine.core.common.businessentities.VM; /** * This comparer chose Vds with more memory available as best diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PowerSaveComparer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PowerSaveComparer.java index 643cf49..125dd90 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PowerSaveComparer.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PowerSaveComparer.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.common.businessentities.*; +import org.ovirt.engine.core.common.businessentities.VDS; +import org.ovirt.engine.core.common.businessentities.VM; /** * Algorithm. For server with desktops and server without desktop server with diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsComparer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsComparer.java index 7cae7e5..f7f4bef 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsComparer.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsComparer.java @@ -1,7 +1,9 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.compat.*; -import org.ovirt.engine.core.common.businessentities.*; +import org.ovirt.engine.core.common.businessentities.VDS; +import org.ovirt.engine.core.common.businessentities.VM; +import org.ovirt.engine.core.common.businessentities.VdsSelectionAlgorithm; +import org.ovirt.engine.core.compat.NotImplementedException; /** * Base class for comparing between vdss diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperation.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperation.java index 55388c9..3df9a6f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperation.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperation.java @@ -1,7 +1,9 @@ package org.ovirt.engine.core.bll.storage; -import org.ovirt.engine.core.common.businessentities.*; -import org.ovirt.engine.core.utils.*; +import org.ovirt.engine.core.common.businessentities.StorageDomain; +import org.ovirt.engine.core.common.businessentities.StoragePool; +import org.ovirt.engine.core.common.businessentities.VDS; +import org.ovirt.engine.core.utils.ISingleAsyncOperation; public abstract class ActivateDeactivateSingleAsyncOperation implements ISingleAsyncOperation { private StorageDomain _domain; @@ -15,6 +17,7 @@ _pool = storagePool; } + @Override public abstract void execute(int iterationId); protected StorageDomain getStorageDomain() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperationFactory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperationFactory.java index 25b9c38..3abfab0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperationFactory.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperationFactory.java @@ -2,9 +2,9 @@ import java.util.ArrayList; -import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StoragePool; +import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.utils.ISingleAsyncOperation; import org.ovirt.engine.core.utils.ISingleAsyncOperationFactory; @@ -25,6 +25,7 @@ return _storagePool; } + @Override public void initialize(ArrayList parameters) { if (!(parameters.get(0) instanceof ArrayList)) { throw new InvalidOperationException(); @@ -44,5 +45,6 @@ _storagePool = (StoragePool) parameters.get(2); } + @Override public abstract ISingleAsyncOperation createSingleAsyncOperation(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperationFactory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperationFactory.java index d815195..a5a5a8e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperationFactory.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperationFactory.java @@ -1,7 +1,7 @@ package org.ovirt.engine.core.bll.storage; -import org.ovirt.engine.core.compat.*; -import org.ovirt.engine.core.utils.*; +import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.utils.ISingleAsyncOperation; public class AfterDeactivateSingleAsyncOperationFactory extends ActivateDeactivateSingleAsyncOperationFactory { private boolean _isLastMaster; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectSingleAsyncOperationFactory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectSingleAsyncOperationFactory.java index dea5ce0..6979836 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectSingleAsyncOperationFactory.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectSingleAsyncOperationFactory.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll.storage; -import org.ovirt.engine.core.utils.*; +import org.ovirt.engine.core.utils.ISingleAsyncOperation; public class ConnectSingleAsyncOperationFactory extends ActivateDeactivateSingleAsyncOperationFactory { @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainsMultipleActionRunner.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainsMultipleActionRunner.java index 08ae78b..c663136 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainsMultipleActionRunner.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainsMultipleActionRunner.java @@ -1,8 +1,10 @@ package org.ovirt.engine.core.bll.storage; import java.util.Collections; -import org.ovirt.engine.core.bll.*; -import org.ovirt.engine.core.common.action.*; + +import org.ovirt.engine.core.bll.SortedMultipleActionsRunnerBase; +import org.ovirt.engine.core.common.action.VdcActionParametersBase; +import org.ovirt.engine.core.common.action.VdcActionType; public class DeactivateStorageDomainsMultipleActionRunner extends SortedMultipleActionsRunnerBase { public DeactivateStorageDomainsMultipleActionRunner(VdcActionType actionType, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DiscoverSendTargetsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DiscoverSendTargetsQuery.java index 155dd8c..1a78629 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DiscoverSendTargetsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DiscoverSendTargetsQuery.java @@ -1,8 +1,10 @@ package org.ovirt.engine.core.bll.storage; -import org.ovirt.engine.core.bll.*; -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.common.vdscommands.*; +import org.ovirt.engine.core.bll.Backend; +import org.ovirt.engine.core.bll.QueriesCommandBase; +import org.ovirt.engine.core.common.queries.DiscoverSendTargetsQueryParameters; +import org.ovirt.engine.core.common.vdscommands.DiscoverSendTargetsVDSCommandParameters; +import org.ovirt.engine.core.common.vdscommands.VDSCommandType; public class DiscoverSendTargetsQuery<P extends DiscoverSendTargetsQueryParameters> extends QueriesCommandBase<P> { public DiscoverSendTargetsQuery(P parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainByIdAndStoragePoolIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainByIdAndStoragePoolIdQuery.java index 5a157f1..f2f0d50 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainByIdAndStoragePoolIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainByIdAndStoragePoolIdQuery.java @@ -1,8 +1,8 @@ package org.ovirt.engine.core.bll.storage; -import org.ovirt.engine.core.bll.*; -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.dal.dbbroker.*; +import org.ovirt.engine.core.bll.QueriesCommandBase; +import org.ovirt.engine.core.common.queries.StorageDomainAndPoolQueryParameters; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class GetStorageDomainByIdAndStoragePoolIdQuery<P extends StorageDomainAndPoolQueryParameters> extends QueriesCommandBase<P> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStoragePoolsByStorageDomainIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStoragePoolsByStorageDomainIdQuery.java index daa8617..7ae582e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStoragePoolsByStorageDomainIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStoragePoolsByStorageDomainIdQuery.java @@ -1,8 +1,8 @@ package org.ovirt.engine.core.bll.storage; -import org.ovirt.engine.core.bll.*; -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.dal.dbbroker.*; +import org.ovirt.engine.core.bll.QueriesCommandBase; +import org.ovirt.engine.core.common.queries.StorageDomainQueryParametersBase; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class GetStoragePoolsByStorageDomainIdQuery<P extends StorageDomainQueryParametersBase> extends QueriesCommandBase<P> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageServerConnectionByIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageServerConnectionByIdQuery.java index 5d9a758..139f455 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageServerConnectionByIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageServerConnectionByIdQuery.java @@ -1,8 +1,8 @@ package org.ovirt.engine.core.bll.storage; -import org.ovirt.engine.core.bll.*; -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.dal.dbbroker.*; +import org.ovirt.engine.core.bll.QueriesCommandBase; +import org.ovirt.engine.core.common.queries.StorageServerConnectionQueryParametersBase; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class GetStorageServerConnectionByIdQuery<P extends StorageServerConnectionQueryParametersBase> extends QueriesCommandBase<P> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperationFactory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperationFactory.java index 9ce71c1..1eb1ee6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperationFactory.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperationFactory.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll.storage; -import org.ovirt.engine.core.utils.*; +import org.ovirt.engine.core.utils.ISingleAsyncOperation; public class RefreshStoragePoolAndDisconnectAsyncOperationFactory extends ActivateDeactivateSingleAsyncOperationFactory { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainsByTypeComparer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainsByTypeComparer.java index 504cce5..f9b4cf8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainsByTypeComparer.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainsByTypeComparer.java @@ -2,7 +2,8 @@ import java.io.Serializable; import java.util.Comparator; -import org.ovirt.engine.core.bll.*; + +import org.ovirt.engine.core.bll.CommandBase; public class StorageDomainsByTypeComparer implements Comparator<CommandBase>, Serializable { @Override diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetTimeZonesQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetTimeZonesQueryTest.java index 9983d32..50389cf 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetTimeZonesQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetTimeZonesQueryTest.java @@ -1,14 +1,16 @@ package org.ovirt.engine.core.bll; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.when; + import java.util.Map; import java.util.TimeZone; + import org.junit.Test; import org.ovirt.engine.core.common.queries.TimeZoneQueryParams; import org.ovirt.engine.core.vdsbroker.vdsbroker.SysprepHandler; - -import static org.mockito.Mockito.when; - public class GetTimeZonesQueryTest extends AbstractSysprepQueryTest<TimeZoneQueryParams, GetTimeZonesQuery<TimeZoneQueryParams>> { -- To view, visit http://gerrit.ovirt.org/14805 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I988e31a8e2c5eae783d528dab16dbdf356aef260 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
