Omer Frenkel has uploaded a new change for review. Change subject: core: add @PostConstruct to postConstruct methods ......................................................................
core: add @PostConstruct to postConstruct methods on newer JBoss (tested with EAP 6.3) the postConstruct methods are not called without the @PostConstruct this of course cause all the commands that are using this not to work. Change-Id: Ibf9cdd60457e60fa4c5257b0c0bc7e659bb7c704 Signed-off-by: Omer Frenkel <ofren...@redhat.com> --- 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/CloneVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java 6 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/39477/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 f50fc49..97f4e4f 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 @@ -93,6 +93,8 @@ import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; +import javax.annotation.PostConstruct; + /** * This class adds a thinly provisioned VM over a template */ @@ -134,6 +136,7 @@ } @Override + @PostConstruct protected void postConstruct() { T parameters = getParameters(); if (parameters.getVmStaticData() != null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java index 85b0ed7..4e86d08 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java @@ -35,6 +35,8 @@ import org.ovirt.engine.core.common.utils.VmDeviceType; import org.ovirt.engine.core.compat.Guid; +import javax.annotation.PostConstruct; + @DisableInPrepareMode @NonTransactiveCommandAttribute(forceCompensation = true) public class CloneVmCommand<T extends CloneVmParameters> extends AddVmAndCloneImageCommand<T> { @@ -52,6 +54,7 @@ } @Override + @PostConstruct protected void postConstruct() { super.postConstruct(); oldVmId = getParameters().getVmId(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java index 9b47802..3ed9b78 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java @@ -45,6 +45,7 @@ import org.ovirt.engine.core.dal.job.ExecutionMessageDirector; import org.ovirt.engine.core.utils.NameForVmInPoolGenerator; +import javax.annotation.PostConstruct; /** * This class is responsible for creation of a vmpool with vms within it. This class is not transactive, @@ -79,6 +80,7 @@ } @Override + @PostConstruct protected void postConstruct() { // skipped if participating in compensation flow if (getParameters() == null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 17222a5..84f656e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -98,6 +98,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.PostConstruct; + @DisableInPrepareMode @NonTransactiveCommandAttribute(forceCompensation = true) public class ImportVmCommand<T extends ImportVmParameters> extends ImportVmCommandBase<T> @@ -116,6 +118,7 @@ } @Override + @PostConstruct protected void postConstruct() { super.postConstruct(); T parameters = getParameters(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommandBase.java index 05b8d2f..adab973 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommandBase.java @@ -40,6 +40,8 @@ import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; +import javax.annotation.PostConstruct; + public abstract class ImportVmCommandBase<T extends ImportVmParameters> extends VmCommand<T> { protected Map<Guid, Guid> imageToDestinationDomainMap; @@ -91,6 +93,7 @@ } @Override + @PostConstruct protected void postConstruct() { T parameters = getParameters(); // before the execute phase, parameters.getVmId().equals(parameters.getVm().getId() == true diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java index 1767943..4318dfb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java @@ -28,6 +28,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.PostConstruct; + @NonTransactiveCommandAttribute(forceCompensation = true) public class ImportVmFromConfigurationCommand<T extends ImportVmParameters> extends ImportVmCommand<T> { @@ -67,6 +69,7 @@ } @Override + @PostConstruct protected void postConstruct() { VM vmFromConfiguration = getParameters().getVm(); if (vmFromConfiguration != null) { -- To view, visit https://gerrit.ovirt.org/39477 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf9cdd60457e60fa4c5257b0c0bc7e659bb7c704 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Omer Frenkel <ofren...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches