Mike Kolesnik has uploaded a new change for review.
Change subject: core: Delete DbUserBase
......................................................................
core: Delete DbUserBase
This class is empty, and no one is using it, so delete it and have
sub-classes extend IVdcQueryable directly (which is Serializable, so no
need to explicitly implement Serializable).
Change-Id: I9d1fbd4dcf4d543706cdd33ccc49505281541f84
Signed-off-by: Mike Kolesnik <mkole...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUserBase.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapGroup.java
M
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
4 files changed, 2 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/10505/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
index 301ee46..b4a9a0c 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
@@ -1,7 +1,5 @@
package org.ovirt.engine.core.common.businessentities;
-import java.io.Serializable;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -20,7 +18,7 @@
@Entity
@Table(name = "users")
@TypeDef(name = "guid", typeClass = GuidType.class)
-public class DbUser extends DbUserBase implements Serializable {
+public class DbUser extends IVdcQueryable {
private static final long serialVersionUID = 7052102138405696755L;
@Id
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUserBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUserBase.java
deleted file mode 100644
index 30cd3a4..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUserBase.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.ovirt.engine.core.common.businessentities;
-
-import java.io.Serializable;
-
-import org.ovirt.engine.core.compat.INotifyPropertyChanged;
-
-public class DbUserBase extends IVdcQueryable implements
INotifyPropertyChanged, Serializable {
- private static final long serialVersionUID = 7161103320297970617L;
-
- public DbUserBase() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapGroup.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapGroup.java
index 647d5c2..b2151d8 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapGroup.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapGroup.java
@@ -1,6 +1,5 @@
package org.ovirt.engine.core.common.businessentities;
-import java.io.Serializable;
import java.util.List;
import javax.persistence.Column;
@@ -19,7 +18,7 @@
@Entity
@Table(name = "ad_groups")
@TypeDef(name = "guid", typeClass = GuidType.class)
-public class LdapGroup extends DbUserBase implements Serializable {
+public class LdapGroup extends IVdcQueryable {
private static final long serialVersionUID = 6717840754119287059L;
@Id
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
index f38ba6d..3ed0ce0 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
@@ -32,7 +32,6 @@
<include name="common/businessentities/event_subscriber.java" />
<include
name="common/businessentities/event_subscriber_id.java" />
<include name="common/businessentities/DbUser.java" />
- <include name="common/businessentities/DbUserBase.java" />
<include name="common/businessentities/custom_actions.java" />
<include name="common/businessentities/BootSequence.java" />
<include name="common/businessentities/IImage.java" />
--
To view, visit http://gerrit.ovirt.org/10505
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d1fbd4dcf4d543706cdd33ccc49505281541f84
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
