Martin Mucha has uploaded a new change for review. Change subject: core: replace specific classes with interfaces in APIs ......................................................................
core: replace specific classes with interfaces in APIs using specific classes instead of interfaces make it hard to craft proper code and spreads through code like a true infection making more code unworthy. The only (semi-valid) argument for such usage is (improper) GWT optimizations (trimming js generated js code), which is not this case. Change-Id: I0f957648fd25acb92eec0da0a6b5995a191f4c2a Signed-off-by: Martin Mucha <mmu...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunner.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunnersFactory.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVMActionRunner.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SortedMultipleActionsRunnerBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/interfaces/BackendInternal.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainsMultipleActionRunner.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainsMultipleActionRunner.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDao.java 13 files changed, 59 insertions(+), 50 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/30796/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java index 27cce95..390defb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java @@ -500,17 +500,17 @@ } @Override - public ArrayList<VdcReturnValueBase> runMultipleActions(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters, boolean isRunOnlyIfAllCanDoPass) { + public List<VdcReturnValueBase> runMultipleActions(VdcActionType actionType, + List<VdcActionParametersBase> parameters, boolean isRunOnlyIfAllCanDoPass) { return runMultipleActions(actionType, parameters, isRunOnlyIfAllCanDoPass, false); } @Override - public ArrayList<VdcReturnValueBase> runMultipleActions(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters, boolean isRunOnlyIfAllCanDoPass, boolean waitForResult) { + public List<VdcReturnValueBase> runMultipleActions(VdcActionType actionType, + List<VdcActionParametersBase> parameters, boolean isRunOnlyIfAllCanDoPass, boolean waitForResult) { VdcReturnValueBase returnValue = notAllowToRunAction(actionType); if (returnValue != null) { - ArrayList<VdcReturnValueBase> list = new ArrayList<VdcReturnValueBase>(); + List<VdcReturnValueBase> list = new ArrayList<>(); list.add(returnValue); return list; } else { @@ -520,22 +520,22 @@ @Override @ExcludeClassInterceptors - public ArrayList<VdcReturnValueBase> runInternalMultipleActions(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters) { + public List<VdcReturnValueBase> runInternalMultipleActions(VdcActionType actionType, + List<VdcActionParametersBase> parameters) { return runMultipleActionsImpl(actionType, parameters, true, false, false, null); } @Override @ExcludeClassInterceptors - public ArrayList<VdcReturnValueBase> runInternalMultipleActions(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters, CommandContext commandContext) { + public List<VdcReturnValueBase> runInternalMultipleActions(VdcActionType actionType, + List<VdcActionParametersBase> parameters, CommandContext commandContext) { return runMultipleActionsImpl(actionType, parameters, true, false, false, commandContext); } - private ArrayList<VdcReturnValueBase> runMultipleActionsImpl(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters, + private List<VdcReturnValueBase> runMultipleActionsImpl(VdcActionType actionType, + List<VdcActionParametersBase> parameters, boolean isInternal, boolean isRunOnlyIfAllCanDoPass, boolean isWaitForResult, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java index b162faa..6cffc92 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java @@ -1,9 +1,9 @@ package org.ovirt.engine.core.bll; -import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.ovirt.engine.core.bll.context.CommandContext; @@ -17,14 +17,14 @@ public class MigrateVMActionRunner extends SortedMultipleActionsRunnerBase { public MigrateVMActionRunner(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters, + List<VdcActionParametersBase> parameters, CommandContext commandContext, boolean isInternal) { super(actionType, parameters, commandContext, isInternal); } @Override protected void sortCommands() { - ArrayList<CommandBase<?>> commands = getCommands(); + List<CommandBase<?>> commands = getCommands(); final Map<Guid, VM> vms = new HashMap<Guid, VM>(commands.size()); for (CommandBase<?> cmd : commands) { vms.put(cmd.getVmId(), DbFacade.getInstance().getVmDao().get(cmd.getVmId())); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunner.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunner.java index ac516e2..6ab0cde 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunner.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunner.java @@ -47,7 +47,7 @@ return commands; } - public ArrayList<VdcReturnValueBase> execute() { + public List<VdcReturnValueBase> execute() { // sanity - don't do anything if no parameters passed if (parameters == null || parameters.isEmpty()) { log.infoFormat("{0} of type {1} invoked with no actions", this.getClass().getSimpleName(), actionType); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunnersFactory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunnersFactory.java index f73a3c1..21189ae 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunnersFactory.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunnersFactory.java @@ -1,7 +1,7 @@ package org.ovirt.engine.core.bll; -import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.Set; import org.ovirt.engine.core.bll.context.CommandContext; @@ -17,7 +17,7 @@ public final class MultipleActionsRunnersFactory { public static MultipleActionsRunner createMultipleActionsRunner(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters, + List<VdcActionParametersBase> parameters, boolean isInternal, CommandContext commandContext) { MultipleActionsRunner runner; switch (actionType) { @@ -98,7 +98,7 @@ return runner; } - private static boolean containsGlusterServer(ArrayList<VdcActionParametersBase> parameters) { + private static boolean containsGlusterServer(List<VdcActionParametersBase> parameters) { Set<Guid> processed = new HashSet<Guid>(); for (VdcActionParametersBase param : parameters) { VDS vds = DbFacade.getInstance().getVdsDao().get(((RemoveVdsParameters) param).getVdsId()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVMActionRunner.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVMActionRunner.java index afdc040..076672f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVMActionRunner.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVMActionRunner.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.common.action.VdcActionParametersBase; @@ -12,15 +13,15 @@ public class RunVMActionRunner extends SortedMultipleActionsRunnerBase { - public RunVMActionRunner(VdcActionType actionType, ArrayList<VdcActionParametersBase> parameters, CommandContext commandContext, boolean isInternal) { + public RunVMActionRunner(VdcActionType actionType, List<VdcActionParametersBase> parameters, CommandContext commandContext, boolean isInternal) { super(actionType, parameters, commandContext, isInternal); } @Override protected void sortCommands() { - ArrayList<CommandBase<?>> commandsList = getCommands(); - HashMap<Guid, RunVmCommandBase<?>> runVmCommandsMap = new HashMap<Guid, RunVmCommandBase<?>>(); + List<CommandBase<?>> commandsList = getCommands(); + Map<Guid, RunVmCommandBase<?>> runVmCommandsMap = new HashMap<Guid, RunVmCommandBase<?>>(); for (CommandBase<?> command : commandsList) { RunVmCommandBase<?> runVMCommandBase = (RunVmCommandBase<?>) command; runVmCommandsMap.put(runVMCommandBase.getVmId(), runVMCommandBase); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SortedMultipleActionsRunnerBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SortedMultipleActionsRunnerBase.java index 0b00cf4d..48b0ed7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SortedMultipleActionsRunnerBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SortedMultipleActionsRunnerBase.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import java.util.ArrayList; +import java.util.List; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.common.action.VdcActionParametersBase; @@ -8,7 +8,7 @@ public abstract class SortedMultipleActionsRunnerBase extends MultipleActionsRunner { public SortedMultipleActionsRunnerBase(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters, CommandContext commandContext, boolean isInternal) { + List<VdcActionParametersBase> parameters, CommandContext commandContext, boolean isInternal) { super(actionType, parameters, commandContext, isInternal); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/interfaces/BackendInternal.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/interfaces/BackendInternal.java index a34511d..36b511b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/interfaces/BackendInternal.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/interfaces/BackendInternal.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll.interfaces; -import java.util.ArrayList; +import java.util.List; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.context.EngineContext; @@ -52,8 +52,8 @@ VdcQueryParametersBase parameters, EngineContext context); - ArrayList<VdcReturnValueBase> runInternalMultipleActions(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters); + List<VdcReturnValueBase> runInternalMultipleActions(VdcActionType actionType, + List<VdcActionParametersBase> parameters); /** * Invokes multiple actions of the same action type with different parameters under a given command context which if @@ -75,8 +75,8 @@ * Determines the visibility of the actions. * @return A collection of the results of each action validation. */ - ArrayList<VdcReturnValueBase> runInternalMultipleActions(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters, CommandContext commandContext); + List<VdcReturnValueBase> runInternalMultipleActions(VdcActionType actionType, + List<VdcActionParametersBase> parameters, CommandContext commandContext); DateTime getStartedAt(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java index e795256..8a8d100 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java @@ -26,9 +26,9 @@ this.network = network; } - public ArrayList<VdcActionParametersBase> buildParameters(List<VdsNetworkInterface> nics) { + public List<VdcActionParametersBase> buildParameters(List<VdsNetworkInterface> nics) { Set<Guid> nonUpdateableHosts = new HashSet<>(); - ArrayList<VdcActionParametersBase> parameters = new ArrayList<>(); + List<VdcActionParametersBase> parameters = new ArrayList<>(); if (NetworkUtils.isManagementNetwork(network)) { return parameters; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java index 7594ff3..f9732e9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java @@ -1,6 +1,5 @@ package org.ovirt.engine.core.bll.network.cluster; -import java.util.ArrayList; import java.util.List; import org.ovirt.engine.core.bll.Backend; @@ -130,9 +129,9 @@ removeNetworkFromHosts(network, context, nics); } - protected static void removeNetworkFromHosts(Network network, CommandContext context, List<VdsNetworkInterface> nics) { + public static void removeNetworkFromHosts(Network network, CommandContext context, List<VdsNetworkInterface> nics) { RemoveNetworkParametersBuilder builder = new RemoveNetworkParametersBuilder(network, context); - ArrayList<VdcActionParametersBase> parameters = builder.buildParameters(nics); + List<VdcActionParametersBase> parameters = builder.buildParameters(nics); if (!parameters.isEmpty()) { NetworkParametersBuilder.updateParametersSequencing(parameters); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainsMultipleActionRunner.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainsMultipleActionRunner.java index 46c3f79..7bd8900 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainsMultipleActionRunner.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainsMultipleActionRunner.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.List; import org.ovirt.engine.core.bll.Backend; import org.ovirt.engine.core.bll.CommandBase; @@ -12,29 +13,29 @@ import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; -import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; import org.ovirt.engine.core.common.businessentities.StoragePool; +import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.threadpool.ThreadPoolUtil; public class AttachStorageDomainsMultipleActionRunner extends SortedMultipleActionsRunnerBase { public AttachStorageDomainsMultipleActionRunner(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters, CommandContext commandContext, boolean isInternal) { + List<VdcActionParametersBase> parameters, CommandContext commandContext, boolean isInternal) { super(actionType, parameters, commandContext, isInternal); } @Override - public ArrayList<VdcReturnValueBase> execute() { + public List<VdcReturnValueBase> execute() { if (getParameters().size() > 0) { StoragePool pool = DbFacade.getInstance().getStoragePoolDao().get( ((StorageDomainPoolParametersBase) getParameters().get(0)).getStoragePoolId()); if (pool.getStatus() == StoragePoolStatus.Uninitialized) { - ArrayList<Guid> storageDomainIds = new ArrayList<Guid>(); + List<Guid> storageDomainIds = new ArrayList<Guid>(); for (VdcActionParametersBase param : getParameters()) { storageDomainIds.add(((StorageDomainPoolParametersBase) param).getStorageDomainId()); } - ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); + List<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); parameters.add(new StoragePoolWithStoragesParameter(pool, storageDomainIds, getParameters().get(0) .getSessionId())); if (isInternal) { 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 6af12d9..2f12776 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,7 +1,7 @@ package org.ovirt.engine.core.bll.storage; -import java.util.ArrayList; import java.util.Collections; +import java.util.List; import org.ovirt.engine.core.bll.SortedMultipleActionsRunnerBase; import org.ovirt.engine.core.bll.context.CommandContext; @@ -10,7 +10,7 @@ public class DeactivateStorageDomainsMultipleActionRunner extends SortedMultipleActionsRunnerBase { public DeactivateStorageDomainsMultipleActionRunner(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters, CommandContext commandContext, boolean isInternal) { + List<VdcActionParametersBase> parameters, CommandContext commandContext, boolean isInternal) { super(actionType, parameters, commandContext, isInternal); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java index 0dd5246..b9d523d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java @@ -1,6 +1,8 @@ package org.ovirt.engine.core.common.interfaces; import java.util.ArrayList; +import java.util.List; + import org.ovirt.engine.core.common.action.LoginUserParameters; import org.ovirt.engine.core.common.action.LogoutUserParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; @@ -21,12 +23,12 @@ ErrorTranslator getVdsErrorsTranslator(); - ArrayList<VdcReturnValueBase> runMultipleActions(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters, + List<VdcReturnValueBase> runMultipleActions(VdcActionType actionType, + List<VdcActionParametersBase> parameters, boolean isRunOnlyIfAllCanDoPass, boolean waitForResult); - ArrayList<VdcReturnValueBase> runMultipleActions(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters, + List<VdcReturnValueBase> runMultipleActions(VdcActionType actionType, + List<VdcActionParametersBase> parameters, boolean isRunOnlyIfAllCanDoPass); void initialize(); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDao.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDao.java index 0af7e26..1337a51 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDao.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDao.java @@ -168,14 +168,20 @@ List<VdsNetworkInterface> getAllInterfacesByLabelForDataCenter(Guid dataCenterId, String label); /** - * Retrieves all interfaces marked with a given label + * @param dataCenterId the data center where the hosts reside in * - * @param clusterId - * the cluster where the hosts reside in - * @param label - * the label to search for - * @return + * @return all interfaces within a specific dataCenter */ + List<VdsNetworkInterface> getAllInterfacesByLabelForDataCenter(Guid dataCenterId, String label); + /** + * Retrieves all interfaces marked with a given label + * + * @param clusterId + * the cluster where the hosts reside in + * @param label + * the label to search for + * @return + */ List<VdsNetworkInterface> getAllInterfacesByLabelForCluster(Guid clusterId, String label); /** -- To view, visit http://gerrit.ovirt.org/30796 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f957648fd25acb92eec0da0a6b5995a191f4c2a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <mmu...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches