Removed overridden persist, remove, and merge functions from ServiceR…

…equestTokenDao to keep consistency with other classes. These functions are now called from AbstractDao.

This was initially included in the spring-hibernate upgrade but is not needed.

src/main/java/org/oscarehr/common/dao/ServiceRequestTokenDao.java

@@ -86,7 +86,4 @@
 public interface ServiceRequestTokenDao extends AbstractDao<ServiceRequestToken>{
     List<ServiceRequestToken> findAll();
     ServiceRequestToken findByTokenId(String token);
-    void persist(ServiceRequestToken token);
-    void remove(ServiceRequestToken token);
-    ServiceRequestToken merge(ServiceRequestToken token);
 }

src/main/java/org/oscarehr/common/dao/ServiceRequestTokenDaoImpl.java

@@ -37,21 +37,6 @@ public class ServiceRequestTokenDaoImpl extends AbstractDaoImpl<ServiceRequestTo
     public ServiceRequestTokenDaoImpl() {
         super(ServiceRequestToken.class);
     }
-
-    @Override
-public void persist(ServiceRequestToken token) {
-    this.entityManager.persist(token);
-}
-
-@Override
-public void remove(ServiceRequestToken token) {
-    this.entityManager.remove(token);
-}
-
-@Override
-public ServiceRequestToken merge(ServiceRequestToken token) {
-    return this.entityManager.merge(token);
-}
 
     @Override
     public List<ServiceRequestToken> findAll() {