Adam Litke has uploaded a new change for review.
Change subject: engine: [cleanup] Rename RunPublicQuery to runPublicQuery
......................................................................
engine: [cleanup] Rename RunPublicQuery to runPublicQuery
Backend.java:598, NM_METHOD_NAMING_CONVENTION, Priority: Low
The method name
org.ovirt.engine.core.bll.Backend.RunPublicQuery(VdcQueryType,
VdcQueryParametersBase)
doesn't start with a lower case letter
Methods should be verbs, in mixed case with the first letter lowercase,
with the first letter of each internal word capitalized.
Change-Id: If105d68de5ad76d61a9123efac5c14440a8a3032
Signed-off-by: Adam Litke <ali...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java
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
M
backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
M
backend/manager/modules/welcome/src/test/java/org/ovirt/engine/core/WelcomeServletTest.java
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java
M
frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java
9 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/21548/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
index d42b216..a06ee7e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
@@ -594,7 +594,7 @@
}
@Override
- public VdcQueryReturnValue RunPublicQuery(VdcQueryType actionType,
VdcQueryParametersBase parameters) {
+ public VdcQueryReturnValue runPublicQuery(VdcQueryType actionType,
VdcQueryParametersBase parameters) {
switch (actionType) {
case GetDomainList:
case RegisterVds:
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java
index eba6c86..746db15 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java
@@ -28,7 +28,7 @@
void initialize();
- VdcQueryReturnValue RunPublicQuery(VdcQueryType actionType,
VdcQueryParametersBase parameters);
+ VdcQueryReturnValue runPublicQuery(VdcQueryType actionType,
VdcQueryParametersBase parameters);
VdcReturnValueBase login(LoginUserParameters parameters);
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 ad31553..6d0273b 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.runPublicQuery(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.runPublicQuery(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 34ce24d..898cdb9 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.runPublicQuery(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.runPublicQuery(eq(VdcQueryType.ValidateSession),
eqQueryParams(VdcQueryParametersBase.class,
new String[] { "SessionId" },
new Object[] { sessionId }) )).andReturn(queryReturnValue);
expect(queryReturnValue.getSucceeded()).andReturn(success).anyTimes();
diff --git
a/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
b/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
index 82bb4ac..3ae65b1 100644
---
a/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
+++
b/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
@@ -79,7 +79,7 @@
protected void doGet(final HttpServletRequest request, final
HttpServletResponse response) throws IOException,
ServletException {
request.setAttribute(LOCALE_KEYS, LocaleFilter.getLocaleKeys());
- String oVirtVersion =
backend.RunPublicQuery(VdcQueryType.GetConfigurationValue,
+ String oVirtVersion =
backend.runPublicQuery(VdcQueryType.GetConfigurationValue,
new
GetConfigurationValueParameters(ConfigurationValues.ProductRPMVersion,
ConfigCommon.defaultConfigurationVersion)).getReturnValue();
request.setAttribute(VERSION, oVirtVersion != null ? oVirtVersion :
"myVersion");
diff --git
a/backend/manager/modules/welcome/src/test/java/org/ovirt/engine/core/WelcomeServletTest.java
b/backend/manager/modules/welcome/src/test/java/org/ovirt/engine/core/WelcomeServletTest.java
index 8be1ce4..e8511d5 100644
---
a/backend/manager/modules/welcome/src/test/java/org/ovirt/engine/core/WelcomeServletTest.java
+++
b/backend/manager/modules/welcome/src/test/java/org/ovirt/engine/core/WelcomeServletTest.java
@@ -53,7 +53,7 @@
private void mockBackendQuery(VdcQueryType queryType, Object returnValue) {
VdcQueryReturnValue queryReturnValueMock =
when(mock(VdcQueryReturnValue.class).getReturnValue())
.thenReturn(returnValue).getMock();
- when(mockBackend.RunPublicQuery(eq(queryType),
any(VdcQueryParametersBase.class)))
+ when(mockBackend.runPublicQuery(eq(queryType),
any(VdcQueryParametersBase.class)))
.thenReturn(queryReturnValueMock);
}
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java
index dc57b5a..a93839e 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java
@@ -64,7 +64,7 @@
VdcQueryParametersBase params) {
log.debug("Server: RunPublicQuery invoked! " + queryType);
//$NON-NLS-1$
debugQuery(queryType, params);
- return getBackend().RunPublicQuery(queryType, params);
+ return getBackend().runPublicQuery(queryType, params);
}
@Override
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 1722547..51b2bba 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
@@ -219,7 +219,7 @@
*/
protected Object runPublicQuery(VdcQueryType queryType,
VdcQueryParametersBase queryParams, String sessionId) {
initQueryParams(queryParams, sessionId);
- VdcQueryReturnValue result = backend.RunPublicQuery(queryType,
queryParams);
+ VdcQueryReturnValue result = backend.runPublicQuery(queryType,
queryParams);
return result.getSucceeded() ? result.getReturnValue() : null;
}
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 954a44a..13a5add 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
@@ -190,7 +190,7 @@
verify(mockConfigQueryParams).setSessionId(sessionId);
verify(mockConfigQueryParams).setHttpSessionId(sessionId);
verify(mockConfigQueryParams).setFiltered(testServlet.filterQueries());
- verify(mockBackend).RunPublicQuery(queryType, mockConfigQueryParams);
+ verify(mockBackend).runPublicQuery(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.runPublicQuery(eq(VdcQueryType.GetConfigurationValue),
isA(GetConfigurationValueParameters.class))).thenReturn(returnValue);
}
--
To view, visit http://gerrit.ovirt.org/21548
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If105d68de5ad76d61a9123efac5c14440a8a3032
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <ali...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
