Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove unused bookmark queries
......................................................................
core: Remove unused bookmark queries
This patch removed the unused GetBookmarkById and GetBookmarkByName
queries.
Removed in this patch:
1. The query classes.
2. The parameter classes used by the aforementioned queries.
3. The validation methods used to validate the aforementioned
parameters.
4. The constants from VdcQueryType corresponding to the aforementioned
queries.
Change-Id: If130d51f240beebcfdda56e8c03c9f0321100ebf
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByIdQuery.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByNameQuery.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetBookmarkByIdParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetBookmarkByNameParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
9 files changed, 0 insertions(+), 97 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/13285/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByIdQuery.java
deleted file mode 100644
index 3c9683c..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByIdQuery.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.businessentities.Bookmark;
-import org.ovirt.engine.core.common.queries.*;
-import org.ovirt.engine.core.dal.dbbroker.*;
-
-// NOT IN USE
-public class GetBookmarkByIdQuery<P extends GetBookmarkByIdParameters> extends
QueriesCommandBase<P> {
- public GetBookmarkByIdQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- Bookmark bookmark =
DbFacade.getInstance().getBookmarkDao().get(getParameters().getBookmarkId());
-
- getQueryReturnValue().setReturnValue(bookmark);
- }
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByNameQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByNameQuery.java
deleted file mode 100644
index 5180a52..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByNameQuery.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.businessentities.Bookmark;
-import org.ovirt.engine.core.common.queries.*;
-import org.ovirt.engine.core.dal.dbbroker.*;
-
-public class GetBookmarkByNameQuery<P extends GetBookmarkByNameParameters>
extends QueriesCommandBase<P> {
- public GetBookmarkByNameQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- GetBookmarkByNameParameters params = (GetBookmarkByNameParameters)
getParameters();
- Bookmark bookmark = DbFacade.getInstance().getBookmarkDao()
- .getByName(params.getBookmarkName());
-
- getQueryReturnValue().setReturnValue(bookmark);
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetBookmarkByIdParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetBookmarkByIdParameters.java
deleted file mode 100644
index cd842a0..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetBookmarkByIdParameters.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-import javax.validation.constraints.NotNull;
-
-import org.ovirt.engine.core.compat.Guid;
-
-public class GetBookmarkByIdParameters extends VdcQueryParametersBase {
- private static final long serialVersionUID = -4325163572694059964L;
-
- public GetBookmarkByIdParameters(Guid bookmarkId) {
- _bookmarkId = bookmarkId;
- }
-
- @NotNull(message = "VALIDATION.BOOKMARKS.ID.NOT_NULL")
- private Guid _bookmarkId;
-
- public Guid getBookmarkId() {
- return _bookmarkId;
- }
-
- public GetBookmarkByIdParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetBookmarkByNameParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetBookmarkByNameParameters.java
deleted file mode 100644
index 081a211..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetBookmarkByNameParameters.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-import javax.validation.constraints.NotNull;
-
-public class GetBookmarkByNameParameters extends VdcQueryParametersBase {
- private static final long serialVersionUID = 488190199396867558L;
-
- public GetBookmarkByNameParameters(String bookmarkName) {
- _bookmarkName = bookmarkName;
- }
-
- @NotNull(message = "VALIDATION.BOOKMARKS.NAME.NOT_NULL")
- private String _bookmarkName;
-
- public String getBookmarkName() {
- return _bookmarkName;
- }
-
- public GetBookmarkByNameParameters() {
- }
-}
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 fd9914b..4fb07f3 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
@@ -134,8 +134,6 @@
GetSystemStatistics,
// Bookmarks
- GetBookmarkById,
- GetBookmarkByName,
GetAllBookmarks,
// FieldsUpdating
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
index 523019c..2169e74 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -576,8 +576,6 @@
VALIDATION.ROLES.ID.NOT_NULL=Role ID is required
VALIDATION.ROLES.NAME.MAX=Role name must not exceed 126 characters
VALIDATION.ROLES.NAME.INVALID=Role name must be formed of "a-z0-9A-Z" or "-_"
-VALIDATION.BOOKMARKS.ID.NOT_NULL=Bookmark ID is required
-VALIDATION.BOOKMARKS.NAME.NOT_NULL= Bookmark name is required
VALIDATION.QUOTA.NAME.INVALID=Quota name must be formed of "a-z0-9A-Z" and "-_"
VALIDATION.VDS_GROUP.NAME.NOT_NULL=Cluster name is required
VALIDATION.VDS_GROUP.NAME.MAX=Cluster name must not exceed 40 characters
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
index 76849d5..434ab66 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
@@ -1543,12 +1543,6 @@
@DefaultStringValue("Role name must not exceed 126 characters")
String VALIDATION_ROLES_NAME_MAX();
- @DefaultStringValue("Bookmark ID is required")
- String VALIDATION_BOOKMARKS_ID_NOT_NULL();
-
- @DefaultStringValue(" Bookmark name is required")
- String VALIDATION_BOOKMARKS_NAME_NOT_NULL();
-
@DefaultStringValue("Cluster name is required")
String VALIDATION_VDS_GROUP_NAME_NOT_NULL();
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index 882d106..95ced59 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -574,8 +574,6 @@
VALIDATION_ROLES_ID_NOT_NULL=Role ID is required
VALIDATION_ROLES_NAME_MAX=Role name must not exceed 126 characters
VALIDATION_ROLES_NAME_INVALID=Role name must be formed of "a-z0-9A-Z" or "-_"
-VALIDATION_BOOKMARKS_ID_NOT_NULL=Bookmark ID is required
-VALIDATION_BOOKMARKS_NAME_NOT_NULL= Bookmark name is required
VALIDATION_QUOTA_NAME_INVALID=Quota name must be formed of "a-z0-9A-Z" and "-_"
VALIDATION_VDS_GROUP_NAME_NOT_NULL=Cluster name is required
VALIDATION_VDS_GROUP_NAME_MAX=Cluster name must not exceed 40 characters
diff --git
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index f2a27f8..21ec932 100644
---
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -570,8 +570,6 @@
VALIDATION_ROLES_NAME_NOT_NULL=Role name is required
VALIDATION_ROLES_ID_NOT_NULL=Role ID is required
VALIDATION_ROLES_NAME_MAX=Role name must not exceed 126 characters
-VALIDATION_BOOKMARKS_ID_NOT_NULL=Bookmark ID is required
-VALIDATION_BOOKMARKS_NAME_NOT_NULL= Bookmark name is required
VALIDATION_VDS_GROUP_NAME_NOT_NULL=Cluster name is required
VALIDATION_VDS_GROUP_NAME_MAX=Cluster name must not exceed 40 characters
VALIDATION_VDS_GROUP_MigrateOnError_NOT_NULL=Cluster migrate on error option
is required
--
To view, visit http://gerrit.ovirt.org/13285
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If130d51f240beebcfdda56e8c03c9f0321100ebf
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
