Laszlo Hornyak has uploaded a new change for review.
Change subject: restapi: move WatchDog enums to model package
......................................................................
restapi: move WatchDog enums to model package
Moved WatchdogAction and WatchdogModel to the model package
Change-Id: I325d04ca2c0a1a513ef035dfb04ebcc7cd1faa7d
Signed-off-by: Laszlo Hornyak <lhorn...@redhat.com>
---
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
R
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/model/WatchdogAction.java
R
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/model/WatchdogModel.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
9 files changed, 16 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/18068/1
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 cd4a07e..b9958c2 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
@@ -97,13 +97,13 @@
import org.ovirt.engine.api.resource.CapabilitiesResource;
import org.ovirt.engine.api.resource.CapabiliyResource;
import org.ovirt.engine.api.restapi.model.StorageFormat;
+import org.ovirt.engine.api.restapi.model.WatchdogAction;
+import org.ovirt.engine.api.restapi.model.WatchdogModel;
import org.ovirt.engine.api.restapi.resource.utils.FeaturesHelper;
import org.ovirt.engine.api.restapi.types.IpVersion;
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..ee52043 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
@@ -4,9 +4,9 @@
import org.ovirt.engine.api.model.WatchDogs;
import org.ovirt.engine.api.resource.WatchdogResource;
import org.ovirt.engine.api.resource.WatchdogsResource;
+import org.ovirt.engine.api.restapi.model.WatchdogAction;
+import org.ovirt.engine.api.restapi.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/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..e30d6a3 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.restapi.model.WatchdogAction;
+import org.ovirt.engine.api.restapi.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..73567d0 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.restapi.model.WatchdogAction;
+import org.ovirt.engine.api.restapi.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..6edff5c 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.restapi.model.WatchdogAction;
+import org.ovirt.engine.api.restapi.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/WatchdogAction.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/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/types/src/main/java/org/ovirt/engine/api/restapi/model/WatchdogAction.java
index c9028d7..6f6262f 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogAction.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/model/WatchdogAction.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.api.restapi.types;
+package org.ovirt.engine.api.restapi.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/types/src/main/java/org/ovirt/engine/api/restapi/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/types/src/main/java/org/ovirt/engine/api/restapi/model/WatchdogModel.java
index c5f3a44..68baeff 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogModel.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/model/WatchdogModel.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.api.restapi.types;
+package org.ovirt.engine.api.restapi.model;
import org.apache.commons.lang.StringUtils;
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..665423d 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.restapi.model.WatchdogAction;
+import org.ovirt.engine.api.restapi.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..e41585f 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.restapi.model.WatchdogAction;
+import org.ovirt.engine.api.restapi.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/18068
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I325d04ca2c0a1a513ef035dfb04ebcc7cd1faa7d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Laszlo Hornyak <lhorn...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
