Moti Asayag has uploaded a new change for review.
Change subject: engine: Refactor network hibernate daos
......................................................................
engine: Refactor network hibernate daos
The patch performs the following:
1. Standardize daos and tests names.
2. Move hibernate and network daos into package.
3. Delete from properties file unimplemented hibernate dao.
Signed-off-by: Moti Asayag <masa...@redhat.com>
Change-Id: Idbd272df9965def23efe6f5e1f19f74d2c94150d
---
M
backend/manager/modules/dal/src/main/hibernate-resources/engine-daos.properties
R
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkClusterDaoHibernateImpl.java
R
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkDaoHibernateImpl.java
R
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoHibernateImplTest.java
4 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/10595/1
diff --git
a/backend/manager/modules/dal/src/main/hibernate-resources/engine-daos.properties
b/backend/manager/modules/dal/src/main/hibernate-resources/engine-daos.properties
index 8773701..532c9fa 100644
---
a/backend/manager/modules/dal/src/main/hibernate-resources/engine-daos.properties
+++
b/backend/manager/modules/dal/src/main/hibernate-resources/engine-daos.properties
@@ -2,7 +2,6 @@
DbUserDAO=org.ovirt.engine.core.dao.DbUserDAOWrapperImpl
VdsDAO=org.ovirt.engine.core.dao.VdsDAOWrapperImpl
AuditLogDAO=org.ovirt.engine.core.dao.AuditLogDAOHibernateImpl
-InterfaceDAO=org.ovirt.engine.core.dao.InterfaceDAOHibernateImpl
LunDAO=org.ovirt.engine.core.dao.LunDAOHibernateImpl
RoleGroupMapDAO=org.ovirt.engine.core.dao.RoleGroupMapDAOHibernateImpl
VmDAO=org.ovirt.engine.core.dao.VmDAOHibernateImpl
@@ -13,11 +12,11 @@
RoleDAO=org.ovirt.engine.core.dao.RoleDAOHibernateImpl
AsyncTaskDAO=org.ovirt.engine.core.dao.AsyncTaskDAOHibernateImpl
AdGroupDAO=org.ovirt.engine.core.dao.AdGroupDAOHibernateImpl
-NetworkDao=org.ovirt.engine.core.dao.NetworkDAOHibernateImpl
+NetworkDao=org.ovirt.engine.core.dao.NetworkDaoHibernateImpl
PermissionDAO=org.ovirt.engine.core.dao.PermissionDAOHibernateImpl
StoragePoolDAO=org.ovirt.engine.core.dao.StoragePoolDAOHibernateImpl
VdcOptionDAO=org.ovirt.engine.core.dao.VdcOptionDAOHibernateImpl
-NetworkClusterDao=org.ovirt.engine.core.dao.NetworkClusterDAOHibernateImpl
+NetworkClusterDao=org.ovirt.engine.core.dao.NetworkClusterDaoHibernateImpl
StorageDomainDAO=org.ovirt.engine.core.dao.StorageDomainDAOWrapperImpl
StorageDomainStaticDAO=org.ovirt.engine.core.dao.StorageDomainStaticDAOHibernateImpl
StorageDomainDynamicDAO=org.ovirt.engine.core.dao.StorageDomainDynamicDAOHibernateImpl
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkClusterDAOHibernateImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkClusterDaoHibernateImpl.java
similarity index 90%
rename from
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkClusterDAOHibernateImpl.java
rename to
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkClusterDaoHibernateImpl.java
index d213de1..f4de241 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkClusterDAOHibernateImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkClusterDaoHibernateImpl.java
@@ -11,12 +11,12 @@
import org.ovirt.engine.core.dao.network.NetworkClusterDao;
/**
- * <code>NetworkClusterDAOHibernateImpl</code> provides an implementation of
{@link NetworkClusterDao} that uses
+ * <code>NetworkClusterDaoHibernateImpl</code> provides an implementation of
{@link NetworkClusterDao} that uses
* Hibernate for the persistence implementation.
*
*/
-public class NetworkClusterDAOHibernateImpl extends
BaseDAOHibernateImpl<NetworkCluster, Guid> implements NetworkClusterDao {
- public NetworkClusterDAOHibernateImpl() {
+public class NetworkClusterDaoHibernateImpl extends
BaseDAOHibernateImpl<NetworkCluster, Guid> implements NetworkClusterDao {
+ public NetworkClusterDaoHibernateImpl() {
super(NetworkCluster.class);
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkDAOHibernateImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkDaoHibernateImpl.java
similarity index 89%
rename from
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkDAOHibernateImpl.java
rename to
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkDaoHibernateImpl.java
index 0ed4877..f4a9fd3 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkDAOHibernateImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkDaoHibernateImpl.java
@@ -9,11 +9,11 @@
import org.ovirt.engine.core.dao.network.NetworkDao;
/**
- * <code>NetworkDAOHibernateImpl</code> provides an implementation of {@Link
NetworkDAO} using Hibernate.
+ * <code>NetworkDaoHibernateImpl</code> provides an implementation of {@Link
NetworkDAO} using Hibernate.
*
*/
-public class NetworkDAOHibernateImpl extends BaseDAOHibernateImpl<Network,
Guid> implements NetworkDao {
- public NetworkDAOHibernateImpl() {
+public class NetworkDaoHibernateImpl extends BaseDAOHibernateImpl<Network,
Guid> implements NetworkDao {
+ public NetworkDaoHibernateImpl() {
super(Network.class);
}
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/NetworkDAOHibernateImplTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoHibernateImplTest.java
similarity index 63%
rename from
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/NetworkDAOHibernateImplTest.java
rename to
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoHibernateImplTest.java
index e578088..c4129ae 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/NetworkDAOHibernateImplTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoHibernateImplTest.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.dao;
+package org.ovirt.engine.core.dao.network;
import static org.mockito.Mockito.mock;
@@ -6,18 +6,19 @@
import org.junit.Before;
import org.junit.Test;
import org.ovirt.engine.core.compat.Guid;
+import org.ovirt.engine.core.dao.NetworkDaoHibernateImpl;
/**
- * A sparse test case for {@link NetworkDAOHibernateImpl}
+ * A sparse test case for {@link NetworkDaoHibernateImpl}
* intended to fail once we start implementing actual methods
*/
-public class NetworkDAOHibernateImplTest {
+public class NetworkDaoHibernateImplTest {
/** The DAO to test */
- private NetworkDAOHibernateImpl dao;
+ private NetworkDaoHibernateImpl dao;
@Before
public void setUp() {
- dao = new NetworkDAOHibernateImpl();
+ dao = new NetworkDaoHibernateImpl();
}
@Test(expected = NotImplementedException.class)
--
To view, visit http://gerrit.ovirt.org/10595
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbd272df9965def23efe6f5e1f19f74d2c94150d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
