Martin Peřina has uploaded a new change for review.
Change subject: core: Stop overriding id of new permission in backend
......................................................................
core: Stop overriding id of new permission in backend
Remove overriding of id of new permission instances created in frontend
code, because we have finally working emulation of UUID.randomUUID() in
frontend code.
Change-Id: I5249177bf0b131346316b84a45a7deb0932611de
Signed-off-by: Martin Perina <mper...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Permission.java
M
frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/java/util/UUID.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java
6 files changed, 1 insertion(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/41984/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java
index 68479fd..70140be 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java
@@ -168,7 +168,6 @@
paramPermission.getObjectId());
if (permission == null) {
- paramPermission.setId(Guid.newGuid());
paramPermission.setAdElementId(principalId);
TransactionSupport.executeInNewTransaction(new
TransactionMethod<Void>() {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Permission.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Permission.java
index a873dcb..6ffc646 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Permission.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Permission.java
@@ -21,18 +21,10 @@
/** timestamp taken when that permission was created, in seconds from
EPOCH **/
private long creationDate;
- /**
- * WARNING: When this constructor is invoked inside GWT compiled code,
please set {@code id} to
- * {@code Guid.Empty} before sending this instance to backend, otherwise
nasty NPE will be raised.
- */
public Permission() {
this (Guid.Empty, Guid.Empty, null, null);
}
- /**
- * WARNING: When this constructor is invoked inside GWT compiled code,
please set {@code id} to
- * {@code Guid.Empty} before sending this instance to backend, otherwise
nasty NPE will be raised.
- */
public Permission(Guid adElementId, Guid roleId, Guid objectId,
VdcObjectType objectType) {
this.id = Guid.newGuid();
this.adElementId = adElementId;
diff --git
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/java/util/UUID.java
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/java/util/UUID.java
index 06cbd03..da5a079 100644
---
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/java/util/UUID.java
+++
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/java/util/UUID.java
@@ -178,7 +178,7 @@
uuid[i] = CHARS[(i == 19) ? (r & 0x3) | 0x8 : r & 0xf];
}
}
- return new String(uuid);
+ return fromString(new String(uuid));
}
/**
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java
index 51616c2..7367c12 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java
@@ -238,9 +238,6 @@
for (DbUser user : items)
{
Permission perm = new Permission(user.getId(), role.getId(),
getEntityGuid(), getObjectType());
- // set id to Guid.Empty as GWT cannot generate new random UUID,
AddPermissionCommand will replace
- // Guid.Empty with correct Guid
- perm.setId(Guid.Empty);
if (user.isGroup())
{
DbGroup group = new DbGroup();
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java
index f0b345f..fa0d03a 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java
@@ -13,7 +13,6 @@
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
-import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.ui.frontend.AsyncQuery;
import org.ovirt.engine.ui.frontend.Frontend;
import org.ovirt.engine.ui.frontend.INewAsyncCallback;
@@ -160,9 +159,6 @@
for (DbUser user : items)
{
Permission perm = new Permission(user.getId(), role.getId(), null,
null);
- // set id to Guid.Empty as GWT cannot generate new random UUID,
AddPermissionCommand will replace
- // Guid.Empty with correct Guid
- perm.setId(Guid.Empty);
if (user.isGroup())
{
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java
index 3164b24..752dfa4 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java
@@ -247,9 +247,6 @@
ApplicationGuids.quotaConsumer.asGuid(),
getEntity().getId(),
VdcObjectType.Quota);
- // set id to Guid.Empty as GWT cannot generate new random UUID,
AddPermissionCommand will replace
- // Guid.Empty with correct Guid
- perm.setId(Guid.Empty);
permissionParams = new PermissionsOperationsParameters();
if (user.isGroup())
--
To view, visit https://gerrit.ovirt.org/41984
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5249177bf0b131346316b84a45a7deb0932611de
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Peřina <mper...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
