Laszlo Hornyak has uploaded a new change for review. Change subject: restapi: move class to another package ......................................................................
restapi: move class to another package moved two classes to another package in another project Change-Id: I36f4bfe8506a6d78aff6a3f90e6f6197f2e62d30 Signed-off-by: Laszlo Hornyak <[email protected]> --- M backend/manager/modules/restapi/interface/definition/pom.xml R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/WatchdogAction.java R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/WatchdogModel.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/WatchdogValidator.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogMapper.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/WatchdogMapperTest.java 10 files changed, 20 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/18293/1 diff --git a/backend/manager/modules/restapi/interface/definition/pom.xml b/backend/manager/modules/restapi/interface/definition/pom.xml index ec1d1e9..dd570b5 100644 --- a/backend/manager/modules/restapi/interface/definition/pom.xml +++ b/backend/manager/modules/restapi/interface/definition/pom.xml @@ -41,6 +41,10 @@ <version>${engine.version}</version> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> </dependencies> <build> diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogAction.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/WatchdogAction.java similarity index 90% rename from backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogAction.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/WatchdogAction.java index c9028d7..17ee9a3 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogAction.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/WatchdogAction.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.api.restapi.types; +package org.ovirt.engine.api.model; import org.apache.commons.lang.StringUtils; diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogModel.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/WatchdogModel.java similarity index 89% rename from backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogModel.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/WatchdogModel.java index c5f3a44..553abf7 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogModel.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/WatchdogModel.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.api.restapi.types; +package org.ovirt.engine.api.model; import org.apache.commons.lang.StringUtils; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java index d02be90..1cecab5 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java @@ -94,7 +94,9 @@ import org.ovirt.engine.api.model.VmTypes; import org.ovirt.engine.api.model.SnapshotStatus; import org.ovirt.engine.api.model.SnapshotStatuses; +import org.ovirt.engine.api.model.WatchdogAction; import org.ovirt.engine.api.model.WatchdogActions; +import org.ovirt.engine.api.model.WatchdogModel; import org.ovirt.engine.api.model.WatchdogModels; import org.ovirt.engine.api.resource.CapabilitiesResource; import org.ovirt.engine.api.resource.CapabiliyResource; @@ -104,8 +106,6 @@ import org.ovirt.engine.api.restapi.model.AuthenticationMethod; import org.ovirt.engine.api.restapi.types.MappingLocator; import org.ovirt.engine.api.restapi.types.NetworkUsage; -import org.ovirt.engine.api.restapi.types.WatchdogAction; -import org.ovirt.engine.api.restapi.types.WatchdogModel; import org.ovirt.engine.api.restapi.util.FenceOptionsParser; import org.ovirt.engine.api.restapi.util.ServerCpuParser; import org.ovirt.engine.api.restapi.util.VersionHelper; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResource.java index de5a186..8770e9c 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResource.java @@ -2,11 +2,11 @@ import org.ovirt.engine.api.model.WatchDog; import org.ovirt.engine.api.model.WatchDogs; +import org.ovirt.engine.api.model.WatchdogAction; +import org.ovirt.engine.api.model.WatchdogModel; import org.ovirt.engine.api.resource.WatchdogResource; import org.ovirt.engine.api.resource.WatchdogsResource; import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource.ParametersProvider; -import org.ovirt.engine.api.restapi.types.WatchdogAction; -import org.ovirt.engine.api.restapi.types.WatchdogModel; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.WatchdogParameters; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/WatchdogValidator.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/WatchdogValidator.java index e2da070..41ac524 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/WatchdogValidator.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/WatchdogValidator.java @@ -2,8 +2,8 @@ import org.ovirt.engine.api.common.util.EnumValidator; import org.ovirt.engine.api.model.WatchDog; -import org.ovirt.engine.api.restapi.types.WatchdogAction; -import org.ovirt.engine.api.restapi.types.WatchdogModel; +import org.ovirt.engine.api.model.WatchdogAction; +import org.ovirt.engine.api.model.WatchdogModel; @ValidatedClass(clazz = WatchDog.class) public class WatchdogValidator implements Validator<WatchDog> { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogResourceTest.java index f8923c1..36cc8c3 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogResourceTest.java @@ -3,9 +3,9 @@ import org.junit.Test; import org.ovirt.engine.api.model.WatchDog; import org.ovirt.engine.api.model.WatchDogs; +import org.ovirt.engine.api.model.WatchdogAction; +import org.ovirt.engine.api.model.WatchdogModel; import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource.ParametersProvider; -import org.ovirt.engine.api.restapi.types.WatchdogAction; -import org.ovirt.engine.api.restapi.types.WatchdogModel; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.WatchdogParameters; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResourceTest.java index fc358b9..7f9a414 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResourceTest.java @@ -6,9 +6,9 @@ import org.ovirt.engine.api.model.VM; import org.ovirt.engine.api.model.WatchDog; import org.ovirt.engine.api.model.WatchDogs; +import org.ovirt.engine.api.model.WatchdogAction; +import org.ovirt.engine.api.model.WatchdogModel; import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource.ParametersProvider; -import org.ovirt.engine.api.restapi.types.WatchdogAction; -import org.ovirt.engine.api.restapi.types.WatchdogModel; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.WatchdogParameters; diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogMapper.java index 557b64b..3de1a80 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogMapper.java @@ -1,6 +1,8 @@ package org.ovirt.engine.api.restapi.types; import org.ovirt.engine.api.model.WatchDog; +import org.ovirt.engine.api.model.WatchdogAction; +import org.ovirt.engine.api.model.WatchdogModel; import org.ovirt.engine.api.restapi.utils.GuidUtils; import org.ovirt.engine.core.common.businessentities.VmWatchdog; import org.ovirt.engine.core.common.businessentities.VmWatchdogAction; diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/WatchdogMapperTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/WatchdogMapperTest.java index 2ec7587..992e210 100644 --- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/WatchdogMapperTest.java +++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/WatchdogMapperTest.java @@ -3,6 +3,8 @@ import org.junit.Assert; import org.junit.Test; import org.ovirt.engine.api.model.WatchDog; +import org.ovirt.engine.api.model.WatchdogAction; +import org.ovirt.engine.api.model.WatchdogModel; import org.ovirt.engine.core.common.businessentities.VmWatchdog; import org.ovirt.engine.core.common.businessentities.VmWatchdogAction; import org.ovirt.engine.core.common.businessentities.VmWatchdogType; -- To view, visit http://gerrit.ovirt.org/18293 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I36f4bfe8506a6d78aff6a3f90e6f6197f2e62d30 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
