Sharad Mishra has uploaded a new change for review.
Change subject: core: Rename class AdRefStatus to LdapRefStatus
......................................................................
core: Rename class AdRefStatus to LdapRefStatus
Since it is a generic LDAP class and not just limited to Active Directory.
Change-Id: I8884cbb83d17d564d294f6502bd665ea8d63da13
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AdRefStatus.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapRefStatus.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ad_groups.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AdGroupDAOTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java
M
backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java
M
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGeneralModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java
12 files changed, 60 insertions(+), 60 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/10045/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
index b1ba565..d2e76ca 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
@@ -12,7 +12,7 @@
import org.ovirt.engine.core.bll.adbroker.LdapSearchByIdParameters;
import org.ovirt.engine.core.bll.adbroker.LdapSearchByUserIdListParameters;
import org.ovirt.engine.core.bll.adbroker.UsersDomainsCacheManagerService;
-import org.ovirt.engine.core.common.businessentities.AdRefStatus;
+import org.ovirt.engine.core.common.businessentities.LdapRefStatus;
import org.ovirt.engine.core.common.businessentities.AdUser;
import org.ovirt.engine.core.common.businessentities.AsyncTaskStatusEnum;
import org.ovirt.engine.core.common.businessentities.DbUser;
@@ -276,9 +276,9 @@
new
LdapSearchByIdParameters(group.getdomain(), group.getid()))
.getReturnValue();
- if (group.getstatus() == AdRefStatus.Active
- && (groupFromAD == null ||
groupFromAD.getstatus() == AdRefStatus.Inactive)) {
- group.setstatus(AdRefStatus.Inactive);
+ if (group.getstatus() == LdapRefStatus.Active
+ && (groupFromAD == null ||
groupFromAD.getstatus() == LdapRefStatus.Inactive)) {
+ group.setstatus(LdapRefStatus.Inactive);
DbFacade.getInstance().getAdGroupDao().update(group);
} else if (groupFromAD != null
&& (!StringUtils.equals(group.getname(),
groupFromAD.getname())
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AdRefStatus.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AdRefStatus.java
deleted file mode 100644
index ee086f5..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AdRefStatus.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.ovirt.engine.core.common.businessentities;
-
-import java.util.HashMap;
-
-public enum AdRefStatus implements Identifiable {
- Inactive(0),
- Active(1);
-
- private int intValue;
- private static java.util.HashMap<Integer, AdRefStatus> mappings = new
HashMap<Integer, AdRefStatus>();
-
- static {
- for (AdRefStatus status : values()) {
- mappings.put(status.getValue(), status);
- }
- }
-
- private AdRefStatus(int value) {
- intValue = value;
- }
-
- @Override
- public int getValue() {
- return intValue;
- }
-
- public static AdRefStatus forValue(int value) {
- return mappings.get(value);
- }
-}
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 9862209..1a61f2c 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
@@ -380,15 +380,15 @@
setdomain(adUser.getDomainControler());
setemail(adUser.getEmail());
setgroups(adUser.getGroup());
- setstatus(AdRefStatus.Active.getValue());
+ setstatus(LdapRefStatus.Active.getValue());
setGroupIds(adUser.getGroupIds());
}
- public AdRefStatus getAdStatus() {
+ public LdapRefStatus getAdStatus() {
if (getstatus() == 0) {
- return AdRefStatus.Inactive;
+ return LdapRefStatus.Inactive;
}
- return AdRefStatus.Active;
+ return LdapRefStatus.Active;
}
public boolean getIsGroup() {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapRefStatus.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapRefStatus.java
new file mode 100644
index 0000000..a6b3d2c
--- /dev/null
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapRefStatus.java
@@ -0,0 +1,30 @@
+package org.ovirt.engine.core.common.businessentities;
+
+import java.util.HashMap;
+
+public enum LdapRefStatus implements Identifiable {
+ Inactive(0),
+ Active(1);
+
+ private int intValue;
+ private static java.util.HashMap<Integer, LdapRefStatus> mappings = new
HashMap<Integer, LdapRefStatus>();
+
+ static {
+ for (LdapRefStatus status : values()) {
+ mappings.put(status.getValue(), status);
+ }
+ }
+
+ private LdapRefStatus(int value) {
+ intValue = value;
+ }
+
+ @Override
+ public int getValue() {
+ return intValue;
+ }
+
+ public static LdapRefStatus forValue(int value) {
+ return mappings.get(value);
+ }
+}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ad_groups.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ad_groups.java
index 3058cf5..a61f1e2 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ad_groups.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ad_groups.java
@@ -35,7 +35,7 @@
private String name;
@Column(name = "status")
- private AdRefStatus status = AdRefStatus.Inactive;
+ private LdapRefStatus status = LdapRefStatus.Inactive;
@Column(name = "domain", length = 100, nullable = false)
private String domain;
@@ -47,7 +47,7 @@
private String distinguishedName;
public ad_groups() {
- this.status = AdRefStatus.Active;
+ this.status = LdapRefStatus.Active;
id = Guid.Empty;
name = "";
distinguishedName = "";
@@ -56,7 +56,7 @@
public ad_groups(Guid id, String name, int status) {
this.id = id;
this.name = name;
- this.status = AdRefStatus.forValue(status);
+ this.status = LdapRefStatus.forValue(status);
}
public Guid getid() {
@@ -75,11 +75,11 @@
this.name = value;
}
- public AdRefStatus getstatus() {
+ public LdapRefStatus getstatus() {
return status;
}
- public void setstatus(AdRefStatus value) {
+ public void setstatus(LdapRefStatus value) {
status = value;
}
@@ -110,7 +110,7 @@
*/
public ad_groups(Guid id) {
this.id = id;
- status = AdRefStatus.Inactive;
+ status = LdapRefStatus.Inactive;
}
public String getdomain() {
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAODbFacadeImpl.java
index f89696e..027b603 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AdGroupDAODbFacadeImpl.java
@@ -3,7 +3,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.AdRefStatus;
+import org.ovirt.engine.core.common.businessentities.LdapRefStatus;
import org.ovirt.engine.core.common.businessentities.ad_groups;
import org.ovirt.engine.core.compat.Guid;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
@@ -81,7 +81,7 @@
ad_groups entity = new ad_groups();
entity.setid(Guid.createGuidFromString(rs.getString("id")));
entity.setname(rs.getString("name"));
- entity.setstatus(AdRefStatus.forValue(rs.getInt("status")));
+ entity.setstatus(LdapRefStatus.forValue(rs.getInt("status")));
entity.setdomain(rs.getString("domain"));
entity.setDistinguishedName(rs.getString("distinguishedname"));
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AdGroupDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AdGroupDAOTest.java
index 2a822b2..e71db6a 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AdGroupDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AdGroupDAOTest.java
@@ -7,7 +7,7 @@
import org.junit.Before;
import org.junit.Test;
-import org.ovirt.engine.core.common.businessentities.AdRefStatus;
+import org.ovirt.engine.core.common.businessentities.LdapRefStatus;
import org.ovirt.engine.core.common.businessentities.ad_groups;
import org.ovirt.engine.core.compat.Guid;
@@ -34,7 +34,7 @@
newAdGroup.setid(Guid.NewGuid());
newAdGroup.setdomain("domain");
newAdGroup.setname("name");
- newAdGroup.setstatus(AdRefStatus.Active);
+ newAdGroup.setstatus(LdapRefStatus.Active);
existingAdGroup = dao.get(new
Guid("b399944a-81ab-4ec5-8266-e19ba7c3c9d1"));
}
@@ -110,7 +110,7 @@
public void testUpdate() {
existingAdGroup.setname(existingAdGroup.getname().toUpperCase());
existingAdGroup.setdomain(existingAdGroup.getdomain().toUpperCase());
- existingAdGroup.setstatus(AdRefStatus.Inactive);
+ existingAdGroup.setstatus(LdapRefStatus.Inactive);
dao.update(existingAdGroup);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java
index 373d70b..11e8ca5 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java
@@ -15,7 +15,7 @@
import org.ovirt.engine.core.common.action.AddUserParameters;
import org.ovirt.engine.core.common.action.AdElementParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
-import org.ovirt.engine.core.common.businessentities.AdRefStatus;
+import org.ovirt.engine.core.common.businessentities.LdapRefStatus;
import org.ovirt.engine.core.common.businessentities.ad_groups;
import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.common.queries.GetAdGroupByIdParameters;
@@ -319,7 +319,7 @@
public static ad_groups setUpEntityExpectations(ad_groups entity, int
index) {
expect(entity.getid()).andReturn(GUIDS[index]).anyTimes();
expect(entity.getdomain()).andReturn(DOMAIN).anyTimes();
- expect(entity.getstatus()).andReturn(AdRefStatus.Active).anyTimes();
+ expect(entity.getstatus()).andReturn(LdapRefStatus.Active).anyTimes();
return entity;
}
}
diff --git
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java
index 96677bf..1e8a230 100644
---
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java
+++
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java
@@ -33,7 +33,7 @@
getTypeDictionary().put("DEPARTMENT", String.class);
getTypeDictionary().put("TITLE", String.class);
getTypeDictionary().put("GROUP", String.class);
- getTypeDictionary().put("STATUS", AdRefStatus.class);
+ getTypeDictionary().put("STATUS", LdapRefStatus.class);
getTypeDictionary().put("ROLE", String.class);
getTypeDictionary().put("TAG", String.class);
getTypeDictionary().put("POOL", String.class);
@@ -68,7 +68,7 @@
public IConditionValueAutoCompleter getFieldValueAutoCompleter(String
fieldName) {
IConditionValueAutoCompleter retval = null;
if (StringHelper.EqOp(fieldName, "STATUS")) {
- retval = new EnumValueAutoCompleter(AdRefStatus.class);
+ retval = new EnumValueAutoCompleter(LdapRefStatus.class);
}
return retval;
}
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 919a13a..a804cc5 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
@@ -12,7 +12,7 @@
<include name="common/businessentities/BusinessEntity.java" />
<include name="common/businessentities/ad_groups.java" />
<include
name="common/businessentities/BusinessEntitiesDefinitions.java" />
- <include name="common/businessentities/AdRefStatus.java" />
+ <include name="common/businessentities/LdapRefStatus.java" />
<include name="common/businessentities/AdUser.java" />
<include name="common/businessentities/AuditLog.java" />
<include name="common/businessentities/bookmarks.java" />
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGeneralModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGeneralModel.java
index 48e2606..031fbcd 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGeneralModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGeneralModel.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.ui.uicommonweb.models.users;
-import org.ovirt.engine.core.common.businessentities.AdRefStatus;
+import org.ovirt.engine.core.common.businessentities.LdapRefStatus;
import org.ovirt.engine.core.common.businessentities.DbUser;
import org.ovirt.engine.core.compat.PropertyChangedEventArgs;
import org.ovirt.engine.core.compat.StringHelper;
@@ -48,14 +48,14 @@
}
}
- private AdRefStatus status;
+ private LdapRefStatus status;
- public AdRefStatus getStatus()
+ public LdapRefStatus getStatus()
{
return status;
}
- public void setStatus(AdRefStatus value)
+ public void setStatus(LdapRefStatus value)
{
if (status != value)
{
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java
index 74a1814..e36b18c 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java
@@ -2,7 +2,7 @@
import javax.inject.Inject;
-import org.ovirt.engine.core.common.businessentities.AdRefStatus;
+import org.ovirt.engine.core.common.businessentities.LdapRefStatus;
import org.ovirt.engine.core.common.businessentities.DbUser;
import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider;
import org.ovirt.engine.ui.common.view.AbstractSubTabFormView;
@@ -35,7 +35,7 @@
TextBoxLabel domain = new TextBoxLabel();
- EnumLabel<AdRefStatus> status = new EnumLabel<AdRefStatus>();
+ EnumLabel<LdapRefStatus> status = new EnumLabel<LdapRefStatus>();
TextBoxLabel email = new TextBoxLabel();
--
To view, visit http://gerrit.ovirt.org/10045
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8884cbb83d17d564d294f6502bd665ea8d63da13
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sharad Mishra <snmis...@linux.vnet.ibm.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
