Oved Ourfali has uploaded a new change for review.
Change subject: core: fix naming conventions to method and field names in bll
......................................................................
core: fix naming conventions to method and field names in bll
Change-Id: Ife2382b63e33775bd257d4f535664925f0b91c6a
Signed-off-by: Oved Ourfali <oourf...@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/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/OvfDataUpdater.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolRunner.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/VmTemplateHandler.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainsMultipleActionRunner.java
9 files changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/22067/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 994e830..f358642 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
@@ -535,11 +535,11 @@
}
}
}
- MultipleActionsRunner runner =
MultipleActionsRunnersFactory.CreateMultipleActionsRunner(actionType,
+ MultipleActionsRunner runner =
MultipleActionsRunnersFactory.createMultipleActionsRunner(actionType,
parameters, isInternal);
runner.setExecutionContext(executionContext);
runner.setIsRunOnlyIfAllCanDoPass(isRunOnlyIfAllCanDoPass);
- return runner.Execute();
+ return runner.execute();
}
@Override
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 6b9316e..6f07312 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
@@ -48,7 +48,7 @@
return _commands;
}
- public ArrayList<VdcReturnValueBase> Execute() {
+ public ArrayList<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);
@@ -74,7 +74,7 @@
ThreadLocalParamsContainer.setCorrelationId(getCommands().get(0).getCorrelationId());
returnValues.add(getCommands().get(0).canDoActionOnly());
} else {
- CheckCanDoActionsAsyncroniousely(returnValues);
+ checkCanDoActionsAsynchronously(returnValues);
}
boolean canRunActions = true;
@@ -91,7 +91,7 @@
ThreadPoolUtil.execute(new Runnable() {
@Override
public void run() {
- RunCommands();
+ runCommands();
}
});
}
@@ -107,7 +107,7 @@
*
* @param returnValues
*/
- private void CheckCanDoActionsAsyncroniousely(
+ private void checkCanDoActionsAsynchronously(
ArrayList<VdcReturnValueBase> returnValues) {
for (int i = 0; i < getCommands().size(); i += CONCURRENT_ACTIONS) {
int handleSize = Math.min(CONCURRENT_ACTIONS, getCommands().size()
- i);
@@ -150,7 +150,7 @@
}
}
- protected void RunCommands() {
+ protected void runCommands() {
for (CommandBase<?> command : getCommands()) {
if (command.getReturnValue().getCanDoAction()) {
executeValidatedCommand(command);
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 b3bdc4f..859af06 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
@@ -15,9 +15,9 @@
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
public final class MultipleActionsRunnersFactory {
- public static MultipleActionsRunner
CreateMultipleActionsRunner(VdcActionType actionType,
- ArrayList<VdcActionParametersBase> parameters,
- boolean isInternal) {
+ public static MultipleActionsRunner
createMultipleActionsRunner(VdcActionType actionType,
+
ArrayList<VdcActionParametersBase> parameters,
+ boolean
isInternal) {
MultipleActionsRunner runner;
switch (actionType) {
case DeactivateStorageDomain: {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
index 34ff5f9..57e96f7 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
@@ -307,7 +307,7 @@
VmTemplate t = getVmTemplateDao().get(vm.getVmtGuid());
vm.setVmtName(t.getName());
} else {
- vm.setVmtName(VmTemplateHandler.BlankVmTemplateName);
+ vm.setVmtName(VmTemplateHandler.BLANK_VM_TEMPLATE_NAME);
}
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolRunner.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolRunner.java
index 96cfd11..9a4c56c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolRunner.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolRunner.java
@@ -16,8 +16,8 @@
}
@Override
- protected void RunCommands() {
- super.RunCommands();
+ protected void runCommands() {
+ super.runCommands();
// remove also the pool if there is no VMs left in it
removePoolIfNeeded();
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 8b8968c..930498b 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
@@ -12,8 +12,8 @@
protected abstract void sortCommands();
@Override
- protected void RunCommands() {
+ protected void runCommands() {
sortCommands();
- super.RunCommands();
+ super.runCommands();
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java
index 4996bb3..9fc6935 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java
@@ -22,7 +22,7 @@
public class VmTemplateHandler {
protected static Guid BlankVmTemplateId = Guid.Empty;
- protected final static String BlankVmTemplateName = "Blank";
+ protected final static String BLANK_VM_TEMPLATE_NAME = "Blank";
private static ObjectIdentityChecker mUpdateVmTemplate;
/**
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
index 33dddfa..24ee4c6 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
@@ -662,7 +662,7 @@
if (Config.<Boolean> GetValue(ConfigValues.EnableVdsLoadBalancing)) {
log.info("Start scheduling to enable vds load balancer");
SchedulerUtilQuartzImpl.getInstance().scheduleAFixedDelayJob(instance,
- "PerformLoadBalancing",
+ "performLoadBalancing",
new Class[] {},
new Object[] {},
Config.<Integer>
GetValue(ConfigValues.VdsLoadBalancingeIntervalInMinutes),
@@ -672,8 +672,8 @@
}
}
- @OnTimerMethodAnnotation("PerformLoadBalancing")
- public void PerformLoadBalancing() {
+ @OnTimerMethodAnnotation("performLoadBalancing")
+ public void performLoadBalancing() {
log.debugFormat("Load Balancer timer entered.");
List<VDSGroup> clusters =
DbFacade.getInstance().getVdsGroupDao().getAll();
for (VDSGroup cluster : clusters) {
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 ce33c6f..37eeee1 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
@@ -23,7 +23,7 @@
}
@Override
- public java.util.ArrayList<VdcReturnValueBase> Execute() {
+ public java.util.ArrayList<VdcReturnValueBase> execute() {
if (getParameters().size() > 0) {
StoragePool pool = DbFacade.getInstance().getStoragePoolDao().get(
((StorageDomainPoolParametersBase)
getParameters().get(0)).getStoragePoolId());
@@ -44,10 +44,10 @@
parameters, false);
}
} else {
- return super.Execute();
+ return super.execute();
}
} else {
- return super.Execute();
+ return super.execute();
}
}
@@ -57,7 +57,7 @@
}
@Override
- protected void RunCommands() {
+ protected void runCommands() {
sortCommands();
for (final CommandBase<?> command : getCommands()) {
--
To view, visit http://gerrit.ovirt.org/22067
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife2382b63e33775bd257d4f535664925f0b91c6a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Oved Ourfali <oourf...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
