Yevgeny Zaspitsky has uploaded a new change for review.
Change subject: engine: Move ManagementNetworkUtil to vdsbroker module
......................................................................
engine: Move ManagementNetworkUtil to vdsbroker module
Move ManagementNetworkUtil to vdsbroker module in order to be able to
use it there.
Note: That is planned to be a temporary solution until it'll be
possible to move it back to bll (extract business logic from
vdsbroker and/or CDI limitation will be removed).
Change-Id: Ic24a70445e672ca88ce425fb89702cf0360dcd67
Signed-off-by: Yevgeny Zaspitsky <[email protected]>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java
R
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtil.java
R
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImpl.java
R
backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImplTest.java
4 files changed, 15 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/33902/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java
index 4b9f015..30cd04e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/BllCDIAdapter.java
@@ -3,6 +3,8 @@
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.InjectionPoint;
+import org.ovirt.engine.core.bll.network.cluster.ManagementNetworkUtil;
+import org.ovirt.engine.core.bll.network.cluster.ManagementNetworkUtilImpl;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dao.network.NetworkClusterDao;
import org.ovirt.engine.core.dao.network.NetworkDao;
@@ -25,7 +27,7 @@
public class BllCDIAdapter {
@Produces
- DbFacade dbFacade = DbFacade.getInstance();
+ private DbFacade dbFacade = DbFacade.getInstance();
/**
* this producer enables injection of Log instance. Its not
@@ -40,7 +42,7 @@
* @param injectionPoint
*/
@Produces
- public Log produceLogger(InjectionPoint injectionPoint) {
+ private Log produceLogger(InjectionPoint injectionPoint) {
return
LogFactory.getLog(injectionPoint.getMember().getDeclaringClass());
}
@@ -50,10 +52,16 @@
}
@Produces
- private NetworkClusterDao getNetworkClusterDao(DbFacade dbFacade) {
+ private NetworkClusterDao produceNetworkClusterDao(DbFacade dbFacade) {
return dbFacade.getNetworkClusterDao();
}
+ @Produces
+ private ManagementNetworkUtil produceManagementNetworkUtil(NetworkDao
networkDao,
+
NetworkClusterDao networkClusterDao) {
+ return new ManagementNetworkUtilImpl(networkDao, networkClusterDao);
+ }
+
private BllCDIAdapter() {
// hide me
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtil.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtil.java
similarity index 100%
rename from
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtil.java
rename to
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtil.java
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImpl.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImpl.java
similarity index 86%
rename from
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImpl.java
rename to
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImpl.java
index 836d02f..3d9cdc4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImpl.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImpl.java
@@ -16,13 +16,15 @@
import org.ovirt.engine.core.utils.linq.Predicate;
@Singleton
-final class ManagementNetworkUtilImpl implements ManagementNetworkUtil {
+// TODO: move the class back to bll module as soon as it will be possible (CDI
cross module issue is solved).
+// Then the class and its constructor should become package-protected back.
+public final class ManagementNetworkUtilImpl implements ManagementNetworkUtil {
private final NetworkDao networkDao;
private final NetworkClusterDao networkClusterDao;
@Inject
- ManagementNetworkUtilImpl(NetworkDao networkDao, NetworkClusterDao
networkClustrerDao) {
+ public ManagementNetworkUtilImpl(NetworkDao networkDao, NetworkClusterDao
networkClustrerDao) {
Validate.notNull(networkDao, "networkDao cannot be null");
Validate.notNull(networkClustrerDao, "networkClustrerDao cannot be
null");
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImplTest.java
b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImplTest.java
similarity index 100%
rename from
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImplTest.java
rename to
backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImplTest.java
--
To view, visit http://gerrit.ovirt.org/33902
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic24a70445e672ca88ce425fb89702cf0360dcd67
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yevgeny Zaspitsky <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
