webservice updated

Author: gdesiato

logicaldoc-core/src/main/java/com/logicaldoc/core/communication/EventCollector.java

@@ -16,7 +16,7 @@
 import com.logicaldoc.core.document.Document;
 import com.logicaldoc.core.document.DocumentDAO;
 import com.logicaldoc.core.history.AbstractDocumentHistory;
-import com.logicaldoc.core.history.ExtendedHistory;
+import com.logicaldoc.core.history.History;
 import com.logicaldoc.core.threading.ThreadPools;
 import com.logicaldoc.util.Context;
 
@@ -64,7 +64,7 @@ public void removeListener(EventListener listener) {
 	 * @param history
 	 * @return true if it was not remembered already, false otherwise
 	 */
-	private boolean rememberHistory(ExtendedHistory history) {
+	private boolean rememberHistory(History history) {
 		Queue<Long> fifo = fifos.get(history.getClass().getName());
 		if (fifo == null) {
 			fifo = new CircularFifoQueue<>(FIFO_SIZE);
@@ -84,7 +84,7 @@ private boolean rememberHistory(ExtendedHistory history) {
 	 * 
 	 * @param history the history to notify
 	 */
-	public void newEvent(ExtendedHistory history) {
+	public void newEvent(History history) {
 		if (!isEnabled()) {
 			log.debug("Aspect {} not enabled", ASPECT);
 			return;

logicaldoc-core/src/main/java/com/logicaldoc/core/communication/EventListener.java

@@ -1,6 +1,6 @@
 package com.logicaldoc.core.communication;
 
-import com.logicaldoc.core.history.ExtendedHistory;
+import com.logicaldoc.core.history.History;
 
 /**
  * A listener for the event emitted by the collector
@@ -15,5 +15,5 @@ public interface EventListener {
 	 * 
 	 * @param event the event to process
 	 */
-	public void newEvent(ExtendedHistory event);
+	public void newEvent(History event);
 }

logicaldoc-core/src/main/java/com/logicaldoc/core/history/HibernateHistoryDAO.java

@@ -21,12 +21,13 @@
 /**
  * Parent of all DAOs that handle histories
  * 
- * @param <T> Class of the implementation of a {@link ExtendedHistory} this DAO handles
+ * @param <T> Class of the implementation of a {@link ExtendedHistory} this DAO
+ *        handles
  * 
  * @author Alessandro Gasparini - LogicalDOC
  * @since 9.0.1
  */
-public abstract class HibernateHistoryDAO<T extends ExtendedHistory> extends HibernatePersistentObjectDAO<T>
+public abstract class HibernateHistoryDAO<T extends History> extends HibernatePersistentObjectDAO<T>
 		implements PersistentObjectDAO<T> {
 
 	@Resource(name = "ContextProperties")
@@ -64,7 +65,7 @@ public void store(T history) throws PersistenceException {
 		EventCollector.get().newEvent(history);
 	}
 
-	protected String getTenantName(ExtendedHistory history) throws PersistenceException {
+	protected String getTenantName(History history) throws PersistenceException {
 		if (HibernateHistoryDAO.tenantNames.containsKey(history.getTenantId()))
 			return HibernateHistoryDAO.tenantNames.get(history.getTenantId());
 

logicaldoc-webapp/src/main/java/com/logicaldoc/web/websockets/EventEndpoint.java

@@ -30,6 +30,7 @@
 import com.logicaldoc.core.folder.FolderEvent;
 import com.logicaldoc.core.history.AbstractDocumentHistory;
 import com.logicaldoc.core.history.ExtendedHistory;
+import com.logicaldoc.core.history.History;
 import com.logicaldoc.core.security.TenantDAO;
 import com.logicaldoc.core.security.user.UserEvent;
 import com.logicaldoc.core.security.user.UserHistory;
@@ -82,7 +83,7 @@ public class EventEndpoint implements EventListener {
 	 * @param history
 	 * @return true if it was not remembered already, false otherwise
 	 */
-	private boolean rememberHistory(ExtendedHistory history) {
+	private boolean rememberHistory(History history) {
 		Queue<Long> fifo = fifos.get(history.getClass().getName());
 		if (fifo == null) {
 			fifo = new CircularFifoQueue<>(FIFO_SIZE);
@@ -138,7 +139,7 @@ public void onBinaryMessage(final byte[] data, final Session session) {
 	}
 
 	@Override
-	public void newEvent(ExtendedHistory event) {
+	public void newEvent(History event) {
 		ContextProperties config = Context.get().getProperties();
 
 		try {
@@ -166,7 +167,7 @@ public void newEvent(ExtendedHistory event) {
 		}
 	}
 
-	private WebsocketMessage prepareMessage(ExtendedHistory event) throws PersistenceException, ServerException {
+	private WebsocketMessage prepareMessage(History event) throws PersistenceException, ServerException {
 		WebsocketMessage message = new WebsocketMessage(event.getSessionId(), event.getEvent());
 		message.setUserId(event.getUserId());
 		message.setUsername(event.getUserLogin());

logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/WebserviceCall.java

@@ -8,7 +8,7 @@
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
-import com.logicaldoc.core.history.ExtendedHistory;
+import com.logicaldoc.core.history.History;
 
 /**
  * Represents a call to the webservice
@@ -20,7 +20,7 @@
 @Table(name = "ld_webservicecall")
 @Cacheable
 @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-public class WebserviceCall extends ExtendedHistory {
+public class WebserviceCall extends History {
 
 	private static final long serialVersionUID = 1L;