Allon Mureinik has uploaded a new change for review.
Change subject: core: Removed unused GetXXXMessageQurey classes
......................................................................
core: Removed unused GetXXXMessageQurey classes
The GetXXXMessagesQuery classes are no longer in use, and thus are
removed from the code base.
This path contains the following:
1. Removing the GetXXMessagesQuery classes.
2. Removing the GetXXMessagesParameteres classes used by the
aforementioned query classes.
3. Removing the constants in VdcQueryType that correspond to the
aforementioned removed queries.
4. Removing the GetMessagesByIdParameterBase which was the base class
for all the aforementioned parameter classes and modifying
GetAllEventMessagesQuery, which was the only query to use
GetMessagesByIdParameterBase directyly to use
VdcQueryParameterBase instead of it.
5. Removing the UserMessageController class which was only used by the
GetUserMessageQuery class.
Change-Id: I747d1bc71bda99717e7816a6674d30e99ed007c8
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllEventMessagesQuery.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetEventMessagesQuery.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTemplateMessagesQuery.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserMessageQuery.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserMessagesQuery.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsMessagesQuery.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsMessagesQuery.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserMessageController.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetEventMessagesParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetMessagesByIdParametersBase.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTemplateMessagesParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetUserMessageParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetUserMessagesParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVdsMessagesParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmsMessagesParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java
17 files changed, 6 insertions(+), 294 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/13282/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllEventMessagesQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllEventMessagesQuery.java
index ae0f132..92c83e1 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllEventMessagesQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllEventMessagesQuery.java
@@ -1,11 +1,11 @@
package org.ovirt.engine.core.bll;
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.AuditLog;
-import org.ovirt.engine.core.common.queries.*;
-// not in use
-public class GetAllEventMessagesQuery<P extends GetEventMessagesParameters>
extends QueriesCommandBase<P> {
+import org.ovirt.engine.core.common.businessentities.AuditLog;
+import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
+
+public class GetAllEventMessagesQuery<P extends VdcQueryParametersBase>
extends QueriesCommandBase<P> {
public GetAllEventMessagesQuery(P parameters) {
super(parameters);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetEventMessagesQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetEventMessagesQuery.java
deleted file mode 100644
index ff0f2cd..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetEventMessagesQuery.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.queries.*;
-
-// not in use
-public class GetEventMessagesQuery<P extends GetEventMessagesParameters>
extends QueriesCommandBase<P> {
- public GetEventMessagesQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- // QueryReturnValue.ReturnValue =
- // ResourceManager.Instance.GetEventMessages((Parameters as
- // GetEventMessagesParameters).Id);
- }
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTemplateMessagesQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTemplateMessagesQuery.java
deleted file mode 100644
index 683599a..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTemplateMessagesQuery.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.queries.*;
-
-// not in use
-public class GetTemplateMessagesQuery<P extends GetTemplateMessagesParameters>
extends QueriesCommandBase<P> {
- public GetTemplateMessagesQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- // QueryReturnValue.ReturnValue =
- // ResourceManager.Instance.GetTemplateMessages((Parameters as
- // GetTemplateMessagesParameters).Id);
- }
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserMessageQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserMessageQuery.java
deleted file mode 100644
index 5e10957..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserMessageQuery.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.queries.*;
-
-public class GetUserMessageQuery<P extends GetUserMessageParameters> extends
QueriesCommandBase<P> {
- public GetUserMessageQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- getQueryReturnValue().setReturnValue(
-
UserMessageController.getInstance().GetUserMessage(getParameters().getId()));
- }
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserMessagesQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserMessagesQuery.java
deleted file mode 100644
index 21f43ed..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserMessagesQuery.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.queries.*;
-
-// not in use
-public class GetUserMessagesQuery<P extends GetUserMessagesParameters> extends
QueriesCommandBase<P> {
- public GetUserMessagesQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- // QueryReturnValue.ReturnValue =
- // ResourceManager.Instance.GetUserMessages((Parameters as
- // GetUserMessagesParameters).Id);
- }
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsMessagesQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsMessagesQuery.java
deleted file mode 100644
index 4cfb55f..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsMessagesQuery.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.queries.*;
-
-// not in use
-public class GetVdsMessagesQuery<P extends GetVdsMessagesParameters> extends
QueriesCommandBase<P> {
- public GetVdsMessagesQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- // QueryReturnValue.ReturnValue =
- // ResourceManager.Instance.GetVdsMessages((Parameters as
- // GetVdsMessagesParameters).getVdsId());
- }
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsMessagesQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsMessagesQuery.java
deleted file mode 100644
index 165b63b..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsMessagesQuery.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.queries.*;
-
-// not in use
-public class GetVmsMessagesQuery<P extends GetVmsMessagesParameters> extends
QueriesCommandBase<P> {
- public GetVmsMessagesQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- // QueryReturnValue.ReturnValue =
- // ResourceManager.Instance.GetVmsMessages((Parameters as
- // GetVmsMessagesParameters).Id);
- }
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserMessageController.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserMessageController.java
deleted file mode 100644
index 641b724..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserMessageController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.ovirt.engine.core.common.businessentities.DbUser;
-import org.ovirt.engine.core.common.businessentities.VmDynamic;
-import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-import org.ovirt.engine.core.utils.MultiValueMapUtils;
-
-public class UserMessageController {
- private final static UserMessageController _instance = new
UserMessageController();
- private final java.util.HashMap<Guid, List<String>> mUsersMessages = new
java.util.HashMap<Guid, List<String>>();
-
- public static UserMessageController getInstance() {
- return _instance;
- }
-
- public void AddUserMessage(Guid user, String userMessage) {
- MultiValueMapUtils.addToMap(user, userMessage, mUsersMessages);
- }
-
- public void AddUserMessageByVds(Guid vdsId, String userMessage) {
- List<Guid> users = new LinkedList<Guid>();
- for (VmDynamic vm :
DbFacade.getInstance().getVmDynamicDao().getAllRunningForVds(vdsId)) {
- AddVmUsersToList(users, vm.getId());
- }
- AddUsersMessages(users, userMessage);
- }
-
- public void AddUserMessageByVm(Guid vmId, String userMessage) {
- List<Guid> users = new LinkedList<Guid>();
- AddVmUsersToList(users, vmId);
- AddUsersMessages(users, userMessage);
- }
-
- private static void AddVmUsersToList(List<Guid> input, Guid vmId) {
- List<DbUser> users = DbFacade.getInstance().getDbUserDao()
- .getAllForVm(vmId);
- if (users != null) {
- for (DbUser user : users) {
- if (!input.contains((user.getuser_id()))) {
- input.add(user.getuser_id());
- }
- }
- }
- }
-
- private void AddUsersMessages(Iterable<Guid> users, String message) {
- for (Guid userId : users) {
- AddUserMessage(userId, message);
- }
- }
-
- public String GetUserMessage(Guid user) {
- if (mUsersMessages.containsKey(user)) {
- List<String> userMessages = mUsersMessages.get(user);
- StringBuilder builder = new StringBuilder();
- for (String message : userMessages) {
- builder.append(message);
- builder.append("\n");
- }
- mUsersMessages.remove(user);
- }
- return "";
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetEventMessagesParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetEventMessagesParameters.java
deleted file mode 100644
index 5338eb6..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetEventMessagesParameters.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-import org.ovirt.engine.core.compat.*;
-
-public class GetEventMessagesParameters extends GetMessagesByIdParametersBase {
- private static final long serialVersionUID = 921754923722982628L;
-
- public GetEventMessagesParameters(Guid vmId) {
- super(vmId);
- }
-
- public GetEventMessagesParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetMessagesByIdParametersBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetMessagesByIdParametersBase.java
deleted file mode 100644
index 03ec250..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetMessagesByIdParametersBase.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-import org.ovirt.engine.core.compat.*;
-
-public class GetMessagesByIdParametersBase extends VdcQueryParametersBase {
- private static final long serialVersionUID = -4356340634971511306L;
-
- public GetMessagesByIdParametersBase(Guid id) {
- _id = id;
- }
-
- private Guid _id = new Guid();
-
- public Guid getId() {
- return _id;
- }
-
- public GetMessagesByIdParametersBase() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTemplateMessagesParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTemplateMessagesParameters.java
deleted file mode 100644
index f62e0e7..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTemplateMessagesParameters.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-import org.ovirt.engine.core.compat.*;
-
-public class GetTemplateMessagesParameters extends
GetMessagesByIdParametersBase {
- private static final long serialVersionUID = 5138681016422927844L;
-
- public GetTemplateMessagesParameters(Guid vmId) {
- super(vmId);
- }
-
- public GetTemplateMessagesParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetUserMessageParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetUserMessageParameters.java
deleted file mode 100644
index 3d2a7d2..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetUserMessageParameters.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-import org.ovirt.engine.core.compat.*;
-
-public class GetUserMessageParameters extends VdcQueryParametersBase {
- private static final long serialVersionUID = 6354989284577351155L;
-
- public GetUserMessageParameters(Guid id) {
- _id = id;
- }
-
- private Guid _id = new Guid();
-
- public Guid getId() {
- return _id;
- }
-
- public GetUserMessageParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetUserMessagesParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetUserMessagesParameters.java
deleted file mode 100644
index bf16bfb..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetUserMessagesParameters.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-import org.ovirt.engine.core.compat.*;
-
-public class GetUserMessagesParameters extends GetMessagesByIdParametersBase {
- private static final long serialVersionUID = 3931907771424026679L;
-
- public GetUserMessagesParameters(Guid vmId) {
- super(vmId);
- }
-
- public GetUserMessagesParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVdsMessagesParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVdsMessagesParameters.java
deleted file mode 100644
index e5d41d6..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVdsMessagesParameters.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class GetVdsMessagesParameters extends VdcQueryParametersBase {
- private static final long serialVersionUID = -7522465676706160504L;
-
- public GetVdsMessagesParameters(int vdsId) {
- _vdsId = vdsId;
- }
-
- private int _vdsId;
-
- public int getVdsId() {
- return _vdsId;
- }
-
- public GetVdsMessagesParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmsMessagesParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmsMessagesParameters.java
deleted file mode 100644
index 7b2b76d..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmsMessagesParameters.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-import org.ovirt.engine.core.compat.*;
-
-public class GetVmsMessagesParameters extends GetMessagesByIdParametersBase {
- private static final long serialVersionUID = -4224784218887876903L;
-
- public GetVmsMessagesParameters(Guid vmId) {
- super(vmId);
- }
-
- public GetVmsMessagesParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
index 2ff8fd5..0589b66 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
@@ -103,7 +103,6 @@
GetDbUserByUserId(VdcQueryAuthType.User),
GetUsersByVmid,
GetVmsByUserid,
- GetUserMessage,
GetUserBySessionId(VdcQueryAuthType.User),
// AdGroups queries
@@ -151,12 +150,7 @@
GetAvailableClusterVersionsByStoragePool,
// AuditLog
- GetVdsMessages,
- GetVmsMessages,
- GetUserMessages,
- GetEventMessages,
GetAllEventMessages(VdcQueryAuthType.User),
- GetTemplateMessages,
GetAllAuditLogsByVMName(VdcQueryAuthType.User),
GetAllAuditLogsByVMTemplateName(VdcQueryAuthType.User),
GetAuditLogById,
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java
index 51d4002..f0cb70b 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java
@@ -14,7 +14,7 @@
import org.ovirt.engine.core.common.businessentities.AuditLog;
import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.common.queries.GetAuditLogByIdParameters;
-import org.ovirt.engine.core.common.queries.GetEventMessagesParameters;
+import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
public class BackendEventsResource extends
@@ -27,7 +27,7 @@
@Override
public Events list() {
if (isFiltered()) {
- return
mapCollection(getBackendCollection(VdcQueryType.GetAllEventMessages, new
GetEventMessagesParameters()));
+ return
mapCollection(getBackendCollection(VdcQueryType.GetAllEventMessages, new
VdcQueryParametersBase()));
} else {
return mapCollection(getBackendCollection());
}
--
To view, visit http://gerrit.ovirt.org/13282
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I747d1bc71bda99717e7816a6674d30e99ed007c8
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
