Juan Hernandez has uploaded a new change for review.
Change subject: restapi: Only one method to set mapping locator
......................................................................
restapi: Only one method to set mapping locator
The method that sets the mapping loator has been recently moved to the
backend base resource class, so it is no longer necessary to have it in
other resources and to explicitly check the type of the resource when
calling it.
Change-Id: I28595e36feb41bf2915e2fb0b28f78d7b3b65f74
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
2 files changed, 1 insertion(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/26428/1
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java
index 5b7d9e1..cc61c2e 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java
@@ -28,14 +28,12 @@
import org.ovirt.engine.api.common.invocation.Current;
import org.ovirt.engine.api.common.security.auth.BasicAuthorizationScheme;
import org.ovirt.engine.api.common.security.auth.Challenger;
-import org.ovirt.engine.api.resource.CapabilitiesResource;
import org.ovirt.engine.api.restapi.logging.MessageBundle;
import org.ovirt.engine.api.restapi.logging.Messages;
import org.ovirt.engine.api.restapi.logging.RequestPayloadLogger;
import org.ovirt.engine.api.restapi.logging.RequestVerbLogger;
import org.ovirt.engine.api.restapi.logging.ResponsePayloadLogger;
import org.ovirt.engine.api.restapi.logging.ResponseStatusLogger;
-import org.ovirt.engine.api.restapi.resource.AbstractBackendResource;
import org.ovirt.engine.api.restapi.resource.BackendApiResource;
import org.ovirt.engine.api.restapi.resource.BackendCapabilitiesResource;
import org.ovirt.engine.api.restapi.resource.BackendClustersResource;
@@ -180,12 +178,7 @@
resource.setMessageBundle(messageBundle);
resource.setBackend(backend);
resource.setSessionHelper(sessionHelper);
- if (resource instanceof AbstractBackendResource) {
- ((AbstractBackendResource)
resource).setMappingLocator(mappingLocator);
- }
- else if (resource instanceof CapabilitiesResource) {
- ((BackendCapabilitiesResource)
resource).setMappingLocator(mappingLocator);
- }
+ resource.setMappingLocator(mappingLocator);
resource.setValidatorLocator(validatorLocator);
singletons.add(resource);
}
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 d695872..34fe734 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
@@ -116,7 +116,6 @@
import org.ovirt.engine.api.restapi.resource.utils.FeaturesHelper;
import org.ovirt.engine.api.restapi.types.CPUMapper;
import org.ovirt.engine.api.restapi.types.IpVersion;
-import org.ovirt.engine.api.restapi.types.MappingLocator;
import org.ovirt.engine.api.restapi.types.NetworkUsage;
import org.ovirt.engine.api.restapi.util.FenceOptionsParser;
import org.ovirt.engine.api.restapi.util.VersionHelper;
@@ -135,12 +134,7 @@
public class BackendCapabilitiesResource extends BackendResource implements
CapabilitiesResource {
- private MappingLocator mappingLocator;
private FeaturesHelper featuresHelper = new FeaturesHelper();
-
- public void setMappingLocator(MappingLocator mappingLocator) {
- this.mappingLocator = mappingLocator;
- }
public static final Version VERSION_3_0 = new Version() {
{
--
To view, visit http://gerrit.ovirt.org/26428
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28595e36feb41bf2915e2fb0b28f78d7b3b65f74
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
