[Engine-patches] Change in ovirt-engine[master]: restapi: Remove runPublicQuery from LoginValidator

[amureini]

Allon Mureinik has uploaded a new change for review.

Change subject: restapi: Remove runPublicQuery from LoginValidator
......................................................................

restapi: Remove runPublicQuery from LoginValidator

Since runPublicQuery is now just a useless wrapper, LoginValidator can
stop calling it, and use the standard (and faster) runQuery instead.

Change-Id: I0a4151a86cd05cdefcba7e3cd4ffebd7b8c202a1
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M 
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java
M 
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/security/auth/LoginValidatorTest.java
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/23002/1

diff --git 
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java
 
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java
index 3684b1f..d272036 100644
--- 
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java
+++ 
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java
@@ -91,7 +91,7 @@
         Principal principal = null;
         VdcQueryParametersBase params = new VdcQueryParametersBase();
         params.setSessionId(sessionId);
-        VdcQueryReturnValue queryReturnValue = 
backend.runPublicQuery(VdcQueryType.ValidateSession, params);
+        VdcQueryReturnValue queryReturnValue = 
backend.runQuery(VdcQueryType.ValidateSession, params);
         if (queryReturnValue != null) {
             DbUser user = queryReturnValue.getReturnValue();
             if (user != null) {
@@ -118,7 +118,7 @@
     }
 
     private ApplicationMode getApplicationMode() {
-        VdcQueryReturnValue result = 
backend.runPublicQuery(VdcQueryType.GetConfigurationValue,
+        VdcQueryReturnValue result = 
backend.runQuery(VdcQueryType.GetConfigurationValue,
                 new 
GetConfigurationValueParameters(ConfigurationValues.ApplicationMode, 
ConfigCommon.defaultConfigurationVersion));
         ApplicationMode appMode = null;
         if (result.getSucceeded())
diff --git 
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/security/auth/LoginValidatorTest.java
 
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/security/auth/LoginValidatorTest.java
index dd1e1fc..8ed6e60 100644
--- 
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/security/auth/LoginValidatorTest.java
+++ 
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/security/auth/LoginValidatorTest.java
@@ -137,7 +137,7 @@
             VdcQueryReturnValue appModeResult = new VdcQueryReturnValue();
             appModeResult.setReturnValue(255);
             appModeResult.setSucceeded(true);
-            
expect(backend.runPublicQuery(eq(VdcQueryType.GetConfigurationValue),
+            expect(backend.runQuery(eq(VdcQueryType.GetConfigurationValue),
                     eqQueryParams(GetConfigurationValueParameters.class, new 
String[] { "ConfigValue" },
                             new Object[] { ConfigurationValues.ApplicationMode 
}))).andReturn(appModeResult);
             current.set(user);
@@ -151,7 +151,7 @@
         VdcQueryReturnValue queryReturnValue = 
control.createMock(VdcQueryReturnValue.class);
         Principal principal = new Principal(USER, SECRET, DOMAIN);
         DbUser user = control.createMock(DbUser.class);
-        expect(backend.runPublicQuery(eq(VdcQueryType.ValidateSession), 
eqQueryParams(VdcQueryParametersBase.class,
+        expect(backend.runQuery(eq(VdcQueryType.ValidateSession), 
eqQueryParams(VdcQueryParametersBase.class,
                 new String[] { "SessionId" },
                 new Object[] { sessionId }) )).andReturn(queryReturnValue);
         expect(queryReturnValue.getSucceeded()).andReturn(success).anyTimes();
@@ -161,7 +161,7 @@
             VdcQueryReturnValue appModeResult = new VdcQueryReturnValue();
             appModeResult.setReturnValue(255);
             appModeResult.setSucceeded(true);
-            
expect(backend.runPublicQuery(eq(VdcQueryType.GetConfigurationValue),
+            expect(backend.runQuery(eq(VdcQueryType.GetConfigurationValue),
                     eqQueryParams(GetConfigurationValueParameters.class, new 
String[] { "ConfigValue" },
                             new Object[] { ConfigurationValues.ApplicationMode 
}))).andReturn(appModeResult);
             current.set(user);


-- 
To view, visit http://gerrit.ovirt.org/23002
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a4151a86cd05cdefcba7e3cd4ffebd7b8c202a1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches