[Engine-patches] Change in ovirt-engine[master]: webadmin: GwtDynamicHostPageServlet.runPublicQuery

[amureini]

Allon Mureinik has uploaded a new change for review.

Change subject: webadmin: GwtDynamicHostPageServlet.runPublicQuery
......................................................................

webadmin: GwtDynamicHostPageServlet.runPublicQuery

Since Backend.runPublicQuery is now just a useless wrapper around
Backend.runQuery, there is no reason to continue using it.

This patch removes GwtDynamicHostPageServlet.runPublicQuery and all its
usages and replaces them with runQuery calls.

Change-Id: I0b03bb27c42a774c68a806ba54002ee8f353a4fa
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M 
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java
M 
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServlet.java
M 
frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java
3 files changed, 5 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/23003/1

diff --git 
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java
 
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java
index 51b2bba..5287abf 100644
--- 
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java
+++ 
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java
@@ -211,18 +211,6 @@
         return result.getSucceeded() ? result.getReturnValue() : null;
     }
 
-    /**
-     * Executes a backend {@linkplain BackendLocal#RunPublicQuery public 
query} and returns its result value if
-     * successful.
-     * <p>
-     * Returns {@code null} otherwise.
-     */
-    protected Object runPublicQuery(VdcQueryType queryType, 
VdcQueryParametersBase queryParams, String sessionId) {
-        initQueryParams(queryParams, sessionId);
-        VdcQueryReturnValue result = backend.runPublicQuery(queryType, 
queryParams);
-        return result.getSucceeded() ? result.getReturnValue() : null;
-    }
-
     protected ObjectNode createObjectNode() {
         return mapper.createObjectNode();
     }
diff --git 
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServlet.java
 
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServlet.java
index 835b31e..2de4433 100644
--- 
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServlet.java
+++ 
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServlet.java
@@ -71,7 +71,7 @@
     }
 
     protected Integer getApplicationMode(String sessionId) {
-        return (Integer) runPublicQuery(VdcQueryType.GetConfigurationValue,
+        return (Integer) runQuery(VdcQueryType.GetConfigurationValue,
                 new 
GetConfigurationValueParameters(ConfigurationValues.ApplicationMode,
                         ConfigCommon.defaultConfigurationVersion), sessionId);
     }
diff --git 
a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java
 
b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java
index 13a5add..170f264 100644
--- 
a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java
+++ 
b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java
@@ -182,15 +182,15 @@
     }
 
     @Test
-    public void testRunPublicQuery_GetConfigurationValue() {
+    public void testRunQuery_GetConfigurationValue() {
         String sessionId = "sessionId"; //$NON-NLS-1$
         VdcQueryType queryType = VdcQueryType.GetConfigurationValue;
-        Object result = testServlet.runPublicQuery(queryType, 
mockConfigQueryParams, sessionId);
+        Object result = testServlet.runQuery(queryType, mockConfigQueryParams, 
sessionId);
         assertThat(result, is(Integer.class));
         verify(mockConfigQueryParams).setSessionId(sessionId);
         verify(mockConfigQueryParams).setHttpSessionId(sessionId);
         verify(mockConfigQueryParams).setFiltered(testServlet.filterQueries());
-        verify(mockBackend).runPublicQuery(queryType, mockConfigQueryParams);
+        verify(mockBackend).runQuery(queryType, mockConfigQueryParams);
     }
 
     @Test
@@ -235,7 +235,7 @@
         VdcQueryReturnValue returnValue = new VdcQueryReturnValue();
         returnValue.setSucceeded(true);
         returnValue.setReturnValue(Integer.valueOf(255));
-        when(mockBackend.runPublicQuery(eq(VdcQueryType.GetConfigurationValue),
+        when(mockBackend.runQuery(eq(VdcQueryType.GetConfigurationValue),
                 
isA(GetConfigurationValueParameters.class))).thenReturn(returnValue);
     }
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b03bb27c42a774c68a806ba54002ee8f353a4fa
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