Gilad Chaplik has uploaded a new change for review.
Change subject: core: fix findbugs issue for PolicyUnit.equals()
......................................................................
core: fix findbugs issue for PolicyUnit.equals()
PolicyUnitImpl is a decorator for PolicyUnit, but doesn't
overrides 'equals' method.
Fixed PolicyUnitImpl to only contain PolicyUnit.
Change-Id: I2d31dfb51268929df30bd468b14bfbc3e336c273
Signed-off-by: Gilad Chaplik <gchap...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/PolicyUnitImpl.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/scheduling/commands/ClusterPolicyCRUDCommand.java
3 files changed, 17 insertions(+), 87 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/19285/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/PolicyUnitImpl.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/PolicyUnitImpl.java
index db6ae79..ccd3eb5 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/PolicyUnitImpl.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/PolicyUnitImpl.java
@@ -28,7 +28,7 @@
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
-public class PolicyUnitImpl extends PolicyUnit {
+public class PolicyUnitImpl {
public static final int MaxSchedulerWeight = Config.<Integer>
GetValue(ConfigValues.MaxSchedulerWeight);;
public static PolicyUnitImpl getPolicyUnitImpl(PolicyUnit policyUnit) {
@@ -78,7 +78,7 @@
}
public List<VDS> filter(List<VDS> hosts, VM vm, Map<String, String>
parameters, List<String> messages) {
- log.error("policy unit:" + getName() + "filter is not implemented");
+ log.error("policy unit:" + getPolicyUnit().getName() + "filter is not
implemented");
return hosts;
}
@@ -95,79 +95,8 @@
List<VDS> hosts,
Map<String, String> parameters,
ArrayList<String> messages) {
- log.error("policy unit:" + getName() + "balance is not implemented");
+ log.error("policy unit:" + getPolicyUnit().getName() + "balance is not
implemented");
return null;
- }
-
- @Override
- public final Guid getId() {
- return policyUnit.getId();
- }
-
- @Override
- public final void setId(Guid id) {
- policyUnit.setId(id);
- }
-
- @Override
- public final String getName() {
- return policyUnit.getName();
- }
-
- @Override
- public final void setName(String name) {
- policyUnit.setName(name);
- }
-
- @Override
- public String getDescription() {
- return policyUnit.getDescription();
- }
-
- @Override
- public void setDescription(String description) {
- policyUnit.setDescription(description);
- }
-
- @Override
- public final boolean isInternal() {
- return policyUnit.isInternal();
- }
-
- @Override
- public final void setInternal(boolean internal) {
- policyUnit.setInternal(internal);
- }
-
- @Override
- public PolicyUnitType getPolicyUnitType() {
- return policyUnit.getPolicyUnitType();
- }
-
- @Override
- public void setPolicyUnitType(PolicyUnitType policyUnitType) {
- policyUnit.setPolicyUnitType(policyUnitType);
- }
-
- @Override
- public final Map<String, String> getParameterRegExMap() {
- return policyUnit.getParameterRegExMap();
- }
-
- @Override
- public final void setParameterRegExMap(Map<String, String>
parameterRegExMap) {
- policyUnit.setParameterRegExMap(parameterRegExMap);
- }
-
- @Override
- public final boolean isEnabled() {
- return policyUnit.isEnabled();
- }
-
- @Override
- public final void setEnabled(boolean enabled) {
- // TODO Auto-generated method stub
- policyUnit.setEnabled(enabled);
}
public final PolicyUnit getPolicyUnit() {
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 c31b91e..58cc099 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
@@ -327,10 +327,10 @@
if (filters != null) {
for (Guid filter : filters) {
PolicyUnitImpl filterPolicyUnit = policyUnits.get(filter);
- if (filterPolicyUnit.isInternal()){
+ if (filterPolicyUnit.getPolicyUnit().isInternal()) {
internalFilters.add(filterPolicyUnit);
} else {
- if (filterPolicyUnit.isEnabled()) {
+ if (filterPolicyUnit.getPolicyUnit().isEnabled()) {
externalFilters.add(filterPolicyUnit);
}
}
@@ -375,7 +375,7 @@
if (filters != null) {
List<String> filterNames = new ArrayList<String>();
for (PolicyUnitImpl filter : filters) {
- filterNames.add(filter.getName());
+ filterNames.add(filter.getPolicyUnit().getName());
}
List<Guid> hostIDs = new ArrayList<Guid>();
for (VDS host : hostList) {
@@ -433,10 +433,10 @@
for (Pair<Guid, Integer> pair : functions) {
PolicyUnitImpl currentPolicy = policyUnits.get(pair.getFirst());
- if(currentPolicy.isInternal()){
+ if (currentPolicy.getPolicyUnit().isInternal()) {
internalScoreFunctions.add(new Pair<PolicyUnitImpl,
Integer>(currentPolicy, pair.getSecond()));
} else {
- if (currentPolicy.isEnabled()) {
+ if (currentPolicy.getPolicyUnit().isEnabled()) {
externalScoreFunctions.add(new Pair<PolicyUnitImpl,
Integer>(currentPolicy, pair.getSecond()));
}
}
@@ -485,7 +485,8 @@
Map<Guid, Integer> hostCostTable) {
List<Pair<String, Integer>> scoreNameAndWeight = new
ArrayList<Pair<String, Integer>>();
for (Pair<PolicyUnitImpl, Integer> pair : functions) {
- scoreNameAndWeight.add(new Pair<String,
Integer>(pair.getFirst().getName(), pair.getSecond()));
+ scoreNameAndWeight.add(new Pair<String,
Integer>(pair.getFirst().getPolicyUnit().getName(),
+ pair.getSecond()));
}
List<Guid> hostIDs = new ArrayList<Guid>();
@@ -534,7 +535,7 @@
}
Map<String, String> map = new LinkedHashMap<String, String>();
for (Guid policyUnitId : usedPolicyUnits) {
- map.putAll(policyUnits.get(policyUnitId).getParameterRegExMap());
+
map.putAll(policyUnits.get(policyUnitId).getPolicyUnit().getParameterRegExMap());
}
return map;
}
@@ -596,9 +597,9 @@
ClusterPolicy policy = policyMap.get(cluster.getClusterPolicyId());
PolicyUnitImpl policyUnit = policyUnits.get(policy.getBalance());
Pair<List<Guid>, Guid> balanceResult = null;
- if (policyUnit.isEnabled()) {
+ if (policyUnit.getPolicyUnit().isEnabled()) {
List<VDS> hosts =
getVdsDAO().getAllForVdsGroupWithoutMigrating(cluster.getId());
- if (policyUnit.isInternal()) {
+ if (policyUnit.getPolicyUnit().isInternal()) {
balanceResult = internalRunBalance(policyUnit, cluster,
hosts);
} else if (Config.<Boolean>
GetValue(ConfigValues.ExternalSchedulerEnabled)) {
balanceResult = externalRunBalance(policyUnit, cluster,
hosts);
@@ -624,7 +625,7 @@
hostIDs.add(vds.getId());
}
return ExternalSchedulerFactory.getInstance()
- .runBalance(policyUnit.getName(), hostIDs,
cluster.getClusterPolicyProperties());
+ .runBalance(policyUnit.getPolicyUnit().getName(), hostIDs,
cluster.getClusterPolicyProperties());
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
index 117674f..c8830bf 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
@@ -47,7 +47,7 @@
if (policyUnitImpl == null) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_CLUSTER_POLICY_UNKNOWN_POLICY_UNIT);
}
- if (policyUnitImpl.getPolicyUnitType() !=
PolicyUnitType.Filter) {
+ if (policyUnitImpl.getPolicyUnit().getPolicyUnitType() !=
PolicyUnitType.Filter) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_CLUSTER_POLICY_FILTER_NOT_IMPLEMENTED);
}
}
@@ -79,7 +79,7 @@
if (policyUnitImpl == null) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_CLUSTER_POLICY_UNKNOWN_POLICY_UNIT);
}
- if (policyUnitImpl.getPolicyUnitType() !=
PolicyUnitType.Weight) {
+ if (policyUnitImpl.getPolicyUnit().getPolicyUnitType() !=
PolicyUnitType.Weight) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_CLUSTER_POLICY_FUNCTION_NOT_IMPLEMENTED);
}
if (functionPair.getSecond() < 0) {
@@ -93,7 +93,7 @@
if (policyUnitImpl == null) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_CLUSTER_POLICY_UNKNOWN_POLICY_UNIT);
}
- if (policyUnitImpl.getPolicyUnitType() !=
PolicyUnitType.LoadBalancing) {
+ if (policyUnitImpl.getPolicyUnit().getPolicyUnitType() !=
PolicyUnitType.LoadBalancing) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_CLUSTER_POLICY_BALANCE_NOT_IMPLEMENTED);
}
}
--
To view, visit http://gerrit.ovirt.org/19285
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d31dfb51268929df30bd468b14bfbc3e336c273
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
