Roy Golan has uploaded a new change for review. Change subject: core: inject Config in AddVmCommand ......................................................................
core: inject Config in AddVmCommand Change-Id: I4819c34dc3068482bb56604c0a1c522b6148f757 Signed-off-by: Roy Golan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/DependencyProducers.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InjectionTest.java 4 files changed, 24 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/29606/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java index 6884b34..bc7239f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java @@ -85,6 +85,8 @@ import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; +import javax.inject.Inject; + /** * This class adds a thinly provisioned VM over a template */ @@ -110,6 +112,9 @@ private Map<Guid, Guid> srcDiskIdToTargetDiskIdMapping = new HashMap<>(); private Map<Guid, Guid> srcVmNicIdToTargetVmNicIdMapping = new HashMap<>(); + @Inject + private Config config; + public AddVmCommand(T parameters) { this(parameters, null); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java index 3b46b45..bb3c0aa 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java @@ -49,7 +49,12 @@ } @Produces @ConfigValue - public Integer produceConfigValue(InjectionPoint injectionPoint) { + public Integer produceIntConfigValue(InjectionPoint injectionPoint) { + return config.get(injectionPoint.getAnnotated().getAnnotation(ConfigValue.class).value()); + } + + @Produces @ConfigValue + public String produceStringConfigValue(InjectionPoint injectionPoint) { return config.get(injectionPoint.getAnnotated().getAnnotation(ConfigValue.class).value()); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/DependencyProducers.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/DependencyProducers.java index 9d8c220..fbfd63b 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/DependencyProducers.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/DependencyProducers.java @@ -1,5 +1,6 @@ package org.ovirt.engine.core.bll; +import org.ovirt.engine.core.common.businessentities.OriginType; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.config.DataType; @@ -21,11 +22,14 @@ @Override public <T> T getValue(ConfigValues configValue, String version) { switch (configValue) { + case OriginType: + return (T) OriginType.OVIRT.name(); case vdsRetries: return (T) Integer.valueOf(3); default: return null; } + } }); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InjectionTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InjectionTest.java index f56dc2c..0540ad8 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InjectionTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InjectionTest.java @@ -28,12 +28,20 @@ @Inject @ConfigValue(ConfigValues.vdsRetries) Integer vdsRetries; + @Inject @ConfigValue(ConfigValues.OriginType) + String originType; + @Test - public void testConfigValueInject() { + public void testIntConfigValueInject() { Assert.assertEquals(3, vdsRetries.intValue()); } @Test + public void testStringConfigValueInject() { + Assert.assertEquals("OVIRT", originType); + } + + @Test public void testConfigInject() { Assert.assertEquals(3, config.<Integer> get(ConfigValues.vdsRetries).intValue()); } -- To view, visit http://gerrit.ovirt.org/29606 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4819c34dc3068482bb56604c0a1c522b6148f757 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
