You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/02/10 11:44:33 UTC
svn commit: r1729579 - in /openmeetings/application:
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/
branches/3.1.x/openmeetings-web/...
Author: solomax
Date: Wed Feb 10 10:44:33 2016
New Revision: 1729579
URL: http://svn.apache.org/viewvc?rev=1729579&view=rev
Log:
Unused 'hash' field was removed from the UserContact, code clean-up
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java?rev=1729579&r1=1729578&r2=1729579&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java Wed Feb 10 10:44:33 2016
@@ -42,18 +42,17 @@ public class UserContactDao {
@Autowired
private UserDao userDao;
- public Long addUserContact(Long userId, Long ownerId, Boolean pending, String hash) {
+ public UserContact add(Long userId, Long ownerId, boolean pending) {
try {
UserContact userContact = new UserContact();
userContact.setInserted(new Date());
userContact.setOwner(userDao.get(ownerId));
userContact.setContact(userDao.get(userId));
userContact.setPending(pending);
- userContact.setHash(hash);
userContact = update(userContact);
- return userContact.getId();
+ return userContact;
} catch (Exception e) {
log.error("[addUserContact]",e);
}
@@ -103,7 +102,7 @@ public class UserContactDao {
return q.getSingleResult();
}
- public List<UserContact> getContactsByUserAndStatus(Long ownerId, Boolean pending) {
+ public List<UserContact> getContactsByUserAndStatus(Long ownerId, boolean pending) {
try {
TypedQuery<UserContact> query = em.createNamedQuery("getContactsByUserAndStatus", UserContact.class);
query.setParameter("ownerId", ownerId);
@@ -145,7 +144,7 @@ public class UserContactDao {
return null;
}
- public List<UserContact> getContactRequestsByUserAndStatus(Long userId, Boolean pending) {
+ public List<UserContact> getContactRequestsByUserAndStatus(Long userId, boolean pending) {
try {
TypedQuery<UserContact> query = em.createNamedQuery("getContactRequestsByUserAndStatus", UserContact.class);
query.setParameter("userId", userId);
@@ -177,7 +176,7 @@ public class UserContactDao {
return em.createNamedQuery("getUserContacts", UserContact.class).getResultList();
}
- public Long updateContactStatus(Long id, Boolean pending) {
+ public Long updateContactStatus(Long id, boolean pending) {
try {
UserContact uc = get(id);
uc.setPending(pending);
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java?rev=1729579&r1=1729578&r2=1729579&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java Wed Feb 10 10:44:33 2016
@@ -42,8 +42,6 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "deleteUserContact", query = "delete from UserContact u where u.id = :id"),
@NamedQuery(name = "deleteAllUserContacts", query = "delete from UserContact u where u.owner.id = :ownerId"),
@NamedQuery(name = "getContactByUserOwner", query = "SELECT c FROM UserContact c WHERE c.contact.id = :userId AND c.owner.id = :ownerId AND c.contact.deleted = false"),
- @NamedQuery(name = "getContactsByHash", query = "select c from UserContact c " +
- "where c.hash like :hash "),
@NamedQuery(name = "getContactsByUserAndStatus", query = "select c from UserContact c " +
"where c.owner.id = :ownerId " +
"AND c.pending = :pending " +
@@ -95,10 +93,6 @@ public class UserContact implements Seri
@Element(data=true)
private boolean pending;
- @Column(name="hash")
- @Element(data=true, required = false)
- private String hash;
-
@Column(name="inserted")
private Date inserted;
@@ -151,13 +145,6 @@ public class UserContact implements Seri
this.updated = updated;
}
- public String getHash() {
- return hash;
- }
- public void setHash(String hash) {
- this.hash = hash;
- }
-
public boolean getShareCalendar() {
return shareCalendar;
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java?rev=1729579&r1=1729578&r2=1729579&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java Wed Feb 10 10:44:33 2016
@@ -21,46 +21,38 @@ package org.apache.openmeetings.web.util
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import java.util.Date;
-
import org.apache.openmeetings.core.mail.MailHandler;
import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
import org.apache.openmeetings.db.dao.user.UserContactDao;
-import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.openmeetings.service.mail.template.RequestContactConfirmTemplate;
import org.apache.openmeetings.service.mail.template.RequestContactTemplate;
-import org.apache.openmeetings.util.CalendarPatterns;
-import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.apache.openmeetings.web.app.Application;
public class ContactsHelper {
- public static long addUserToContactList(long userIdToAdd) {
+ public static Long addUserToContactList(long userIdToAdd) {
boolean isContact = getBean(UserContactDao.class).isContact(userIdToAdd, getUserId());
if (isContact) {
return -45L;
}
- String hash = ManageCryptStyle.getInstanceOfCrypt()
- .createPassPhrase(CalendarPatterns.getDateWithTimeByMiliSeconds(new Date()));
-
- Long userContactId = getBean(UserContactDao.class).addUserContact(userIdToAdd, getUserId(), true, hash);
+ UserContact contact = getBean(UserContactDao.class).add(userIdToAdd, getUserId(), true);
- User user = getBean(UserDao.class).get(getUserId());
- User userToAdd = getBean(UserDao.class).get(userIdToAdd);
+ User user = contact.getOwner();
+ User userToAdd = contact.getContact();
String subj = user.getFirstname() + " " + user.getLastname() + " " + Application.getString(1193);
String message = RequestContactTemplate.getEmail(userToAdd, user);
getBean(PrivateMessageDao.class).addPrivateMessage(
- subj, message, 0L, user, userToAdd, userToAdd, false, null, true, userContactId);
+ subj, message, 0L, user, userToAdd, userToAdd, false, null, true, contact.getId());
if (userToAdd.getAddress() != null) {
getBean(MailHandler.class).send(userToAdd.getAddress().getEmail(), subj, message);
}
- return userContactId;
+ return contact.getId();
}
public static Long acceptUserContact(long userContactId) {
@@ -80,7 +72,7 @@ public class ContactsHelper {
contact = dao.get(userContactId);
User user = contact.getOwner();
- dao.addUserContact(user.getId(), getUserId(), false, "");
+ dao.add(user.getId(), getUserId(), false);
if (user.getAddress() != null) {
String message = RequestContactConfirmTemplate.getEmail(contact);
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java?rev=1729579&r1=1729578&r2=1729579&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java Wed Feb 10 10:44:33 2016
@@ -42,18 +42,17 @@ public class UserContactDao {
@Autowired
private UserDao userDao;
- public Long addUserContact(Long userId, Long ownerId, Boolean pending, String hash) {
+ public UserContact add(Long userId, Long ownerId, boolean pending) {
try {
UserContact userContact = new UserContact();
userContact.setInserted(new Date());
userContact.setOwner(userDao.get(ownerId));
userContact.setContact(userDao.get(userId));
userContact.setPending(pending);
- userContact.setHash(hash);
userContact = update(userContact);
- return userContact.getId();
+ return userContact;
} catch (Exception e) {
log.error("[addUserContact]",e);
}
@@ -103,7 +102,7 @@ public class UserContactDao {
return q.getSingleResult();
}
- public List<UserContact> getContactsByUserAndStatus(Long ownerId, Boolean pending) {
+ public List<UserContact> getContactsByUserAndStatus(Long ownerId, boolean pending) {
try {
TypedQuery<UserContact> query = em.createNamedQuery("getContactsByUserAndStatus", UserContact.class);
query.setParameter("ownerId", ownerId);
@@ -145,7 +144,7 @@ public class UserContactDao {
return null;
}
- public List<UserContact> getContactRequestsByUserAndStatus(Long userId, Boolean pending) {
+ public List<UserContact> getContactRequestsByUserAndStatus(Long userId, boolean pending) {
try {
TypedQuery<UserContact> query = em.createNamedQuery("getContactRequestsByUserAndStatus", UserContact.class);
query.setParameter("userId", userId);
@@ -177,7 +176,7 @@ public class UserContactDao {
return em.createNamedQuery("getUserContacts", UserContact.class).getResultList();
}
- public Long updateContactStatus(Long id, Boolean pending) {
+ public Long updateContactStatus(Long id, boolean pending) {
try {
UserContact uc = get(id);
uc.setPending(pending);
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java?rev=1729579&r1=1729578&r2=1729579&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java Wed Feb 10 10:44:33 2016
@@ -42,8 +42,6 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "deleteUserContact", query = "delete from UserContact u where u.id = :id"),
@NamedQuery(name = "deleteAllUserContacts", query = "delete from UserContact u where u.owner.id = :ownerId"),
@NamedQuery(name = "getContactByUserOwner", query = "SELECT c FROM UserContact c WHERE c.contact.id = :userId AND c.owner.id = :ownerId AND c.contact.deleted = false"),
- @NamedQuery(name = "getContactsByHash", query = "select c from UserContact c " +
- "where c.hash like :hash "),
@NamedQuery(name = "getContactsByUserAndStatus", query = "select c from UserContact c " +
"where c.owner.id = :ownerId " +
"AND c.pending = :pending " +
@@ -95,10 +93,6 @@ public class UserContact implements Seri
@Element(data=true)
private boolean pending;
- @Column(name="hash")
- @Element(data=true, required = false)
- private String hash;
-
@Column(name="inserted")
private Date inserted;
@@ -151,13 +145,6 @@ public class UserContact implements Seri
this.updated = updated;
}
- public String getHash() {
- return hash;
- }
- public void setHash(String hash) {
- this.hash = hash;
- }
-
public boolean getShareCalendar() {
return shareCalendar;
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java?rev=1729579&r1=1729578&r2=1729579&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java Wed Feb 10 10:44:33 2016
@@ -21,46 +21,38 @@ package org.apache.openmeetings.web.util
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import java.util.Date;
-
import org.apache.openmeetings.core.mail.MailHandler;
import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
import org.apache.openmeetings.db.dao.user.UserContactDao;
-import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.openmeetings.service.mail.template.RequestContactConfirmTemplate;
import org.apache.openmeetings.service.mail.template.RequestContactTemplate;
-import org.apache.openmeetings.util.CalendarPatterns;
-import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.apache.openmeetings.web.app.Application;
public class ContactsHelper {
- public static long addUserToContactList(long userIdToAdd) {
+ public static Long addUserToContactList(long userIdToAdd) {
boolean isContact = getBean(UserContactDao.class).isContact(userIdToAdd, getUserId());
if (isContact) {
return -45L;
}
- String hash = ManageCryptStyle.getInstanceOfCrypt()
- .createPassPhrase(CalendarPatterns.getDateWithTimeByMiliSeconds(new Date()));
-
- Long userContactId = getBean(UserContactDao.class).addUserContact(userIdToAdd, getUserId(), true, hash);
+ UserContact contact = getBean(UserContactDao.class).add(userIdToAdd, getUserId(), true);
- User user = getBean(UserDao.class).get(getUserId());
- User userToAdd = getBean(UserDao.class).get(userIdToAdd);
+ User user = contact.getOwner();
+ User userToAdd = contact.getContact();
String subj = user.getFirstname() + " " + user.getLastname() + " " + Application.getString(1193);
String message = RequestContactTemplate.getEmail(userToAdd, user);
getBean(PrivateMessageDao.class).addPrivateMessage(
- subj, message, 0L, user, userToAdd, userToAdd, false, null, true, userContactId);
+ subj, message, 0L, user, userToAdd, userToAdd, false, null, true, contact.getId());
if (userToAdd.getAddress() != null) {
getBean(MailHandler.class).send(userToAdd.getAddress().getEmail(), subj, message);
}
- return userContactId;
+ return contact.getId();
}
public static Long acceptUserContact(long userContactId) {
@@ -80,7 +72,7 @@ public class ContactsHelper {
contact = dao.get(userContactId);
User user = contact.getOwner();
- dao.addUserContact(user.getId(), getUserId(), false, "");
+ dao.add(user.getId(), getUserId(), false);
if (user.getAddress() != null) {
String message = RequestContactConfirmTemplate.getEmail(contact);