Author: dkuleshov Date: 2011-12-12 10:20:42 -0500 (Mon, 12 Dec 2011) New Revision: 5323 Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/GroupDAOImpl.java core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipTypeDAOImpl.java core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserProfileDAOImpl.java core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveMembershipListener.java Log: EXOJCR-1554: replaced addLIKE with addEQ where needed Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/GroupDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/GroupDAOImpl.java 2011-12-12 14:28:24 UTC (rev 5322) +++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/GroupDAOImpl.java 2011-12-12 15:20:42 UTC (rev 5323) @@ -82,7 +82,7 @@ DBObjectQuery<GroupImpl> query = new DBObjectQuery<GroupImpl>(GroupImpl.class); if (parent != null) { - query.addLIKE("GROUP_ID", parent.getId()); + query.addEQ("GROUP_ID", parent.getId()); Group parentGroup = super.loadUnique(connection, query.toQuery()); if (parentGroup == null) { @@ -99,7 +99,7 @@ } query.getParameters().clear(); - query.addLIKE("GROUP_ID", groupId); + query.addEQ("GROUP_ID", groupId); Group o = super.loadUnique(connection, query.toQuery()); if (o != null) { @@ -137,7 +137,7 @@ public Group findGroupById(String groupId) throws Exception { DBObjectQuery<GroupImpl> query = new DBObjectQuery<GroupImpl>(GroupImpl.class); - query.addLIKE("GROUP_ID", groupId); + query.addEQ("GROUP_ID", groupId); Group g = super.loadUnique(query.toQuery()); if (log.isDebugEnabled()) log.debug("----------FIND GROUP BY ID: " + groupId + " _ " + (g != null)); @@ -172,7 +172,7 @@ if (parent != null) parentId = parent.getId(); DBObjectQuery<GroupImpl> query = new DBObjectQuery<GroupImpl>(GroupImpl.class); - query.addLIKE("PARENT_ID", parentId); + query.addEQ("PARENT_ID", parentId); DBPageList<GroupImpl> pageList = new DBPageList<GroupImpl>(20, this, query); if (log.isDebugEnabled()) { Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipTypeDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipTypeDAOImpl.java 2011-12-12 14:28:24 UTC (rev 5322) +++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipTypeDAOImpl.java 2011-12-12 15:20:42 UTC (rev 5323) @@ -69,7 +69,7 @@ public MembershipType findMembershipType(String name) throws Exception { DBObjectQuery<MembershipTypeImpl> query = new DBObjectQuery<MembershipTypeImpl>(MembershipTypeImpl.class); - query.addLIKE("MT_NAME", name); + query.addEQ("MT_NAME", name); MembershipType mt = loadUnique(query.toQuery());; // System.out.println("===========FIND MT BY NAME" + name + " - " + // (mt!=null)); @@ -89,7 +89,7 @@ public MembershipType removeMembershipType(String name, boolean broadcast) throws Exception { DBObjectQuery<MembershipTypeImpl> query = new DBObjectQuery<MembershipTypeImpl>(MembershipTypeImpl.class); - query.addLIKE("MT_NAME", name); + query.addEQ("MT_NAME", name); MembershipTypeImpl mt = loadUnique(query.toQuery()); if (mt == null) { Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java 2011-12-12 14:28:24 UTC (rev 5322) +++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java 2011-12-12 15:20:42 UTC (rev 5323) @@ -126,10 +126,12 @@ public User findUserByName(String userName) throws Exception { DBObjectQuery<UserImpl> query = new DBObjectQuery<UserImpl>(UserImpl.class); - query.addLIKE("USER_NAME", userName); + query.addEQ("USER_NAME", userName); User user = loadUnique(query.toQuery());; if (log.isDebugEnabled()) + { log.debug("+++++++++++FIND USER BY USER NAME " + userName + " - " + (user != null)); + } return user; } @@ -187,7 +189,7 @@ DBObjectQuery dbQuery = new DBObjectQuery<UserImpl>(UserImpl.class); for (Membership member : members) { - dbQuery.addLIKE("USER_NAME", member.getUserName()); + dbQuery.addEQ("USER_NAME", member.getUserName()); } return new JDBCListAccess<User>(this, dbQuery.toQueryUseOR(), dbQuery.toCountQueryUseOR()); Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserProfileDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserProfileDAOImpl.java 2011-12-12 14:28:24 UTC (rev 5322) +++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserProfileDAOImpl.java 2011-12-12 15:20:42 UTC (rev 5323) @@ -73,7 +73,7 @@ private UserProfileData findUserProfileDataByName(String userName) throws Exception { DBObjectQuery<UserProfileData> query = new DBObjectQuery<UserProfileData>(UserProfileData.class); - query.addLIKE("USER_NAME", userName); + query.addEQ("USER_NAME", userName); return loadUnique(query.toQuery()); } Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveMembershipListener.java =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveMembershipListener.java 2011-12-12 14:28:24 UTC (rev 5322) +++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveMembershipListener.java 2011-12-12 15:20:42 UTC (rev 5323) @@ -78,7 +78,7 @@ MembershipType memberType = (MembershipType)target; MembershipDAOImpl mtHandler = (MembershipDAOImpl)service_.getMembershipHandler(); DBObjectQuery<MembershipImpl> query = new DBObjectQuery<MembershipImpl>(MembershipImpl.class); - query.addLIKE("MEMBERSHIP_TYPE", memberType.getName()); + query.addEQ("MEMBERSHIP_TYPE", memberType.getName()); mtHandler.removeMemberships(query, true); } catch (Exception e)