changed hibernate_sequences into ld_hilo

Author: gdesiato

logicaldoc-core/src/main/java/com/logicaldoc/core/PersistentObject.java

@@ -38,7 +38,7 @@ public abstract class PersistentObject implements Serializable {
 	@Id
 	@GeneratedValue(generator = "hilo")
 	@GenericGenerator(name = "hilo", strategy = "enhanced-table", parameters = {
-			@Parameter(name = "table_name", value = "hibernate_sequences"),
+			@Parameter(name = "table_name", value = "ld_hilo"),
 			@Parameter(name = "prefer_entity_table_as_segment_value", value = "true"),
 			@Parameter(name = "optimizer", value = "org.hibernate.id.enhanced.HiLoOptimizer"),
 			@Parameter(name = "initial_value", value = "100") })

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

@@ -2,12 +2,10 @@
 
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
-import javax.persistence.Transient;
 
 import com.logicaldoc.core.document.AbstractDocument;
 import com.logicaldoc.core.document.Document;
 import com.logicaldoc.core.document.Version;
-import com.logicaldoc.core.folder.Folder;
 
 /**
  * A superclass for those histories tightly related to documents
@@ -20,6 +18,9 @@ public abstract class AbstractDocumentHistory extends ExtendedHistory {
 
 	private static final long serialVersionUID = 1L;
 
+	@Column(name = "ld_docid")
+	private Long docId;
+	
 	@Column(name = "ld_version", length = 10)
 	protected String version = null;
 
@@ -31,68 +32,17 @@ public abstract class AbstractDocumentHistory extends ExtendedHistory {
 
 	@Column(name = "ld_filenameold", length = 255)
 	protected String filenameOld = null;
-	
-	@Column(name = "ld_docid")
-	private Long docId;
-
-	@Column(name = "ld_folderid")
-	private Long folderId;
 
-	@Column(name = "ld_filename", length = 255)
-	private String filename = null;
-
-	@Column(name = "ld_filesize")
-	private Long fileSize = null;
-
-	/**
-	 * Something to better qualify the event
-	 */
-	@Column(name = "ld_reason")
-	private String reason = null;
-	
-	// Not persistent
-	@Transient
-	private AbstractDocument document;
-
-	// Not persistent
-	@Transient
-	private Folder folder;
-
-
-	public AbstractDocumentHistory() {
-		super();
-	}
-	
 	public Long getDocId() {
 		return docId;
 	}
 
 	public void setDocId(Long docId) {
 		this.docId = docId;
 	}
-
-	public Long getFolderId() {
-		return folderId;
-	}
-
-	public void setFolderId(Long folderId) {
-		this.folderId = folderId;
-	}
-
-	public String getFilename() {
-		return filename;
-	}
-
-	public void setFilename(String filename) {
-		this.filename = filename;
-	}
-
-	public Long getFileSize() {
-		return fileSize;
-	}
-
-	public void setFileSize(Long fileSize) {
-		this.fileSize = fileSize;
+	
+	public AbstractDocumentHistory() {
+		super();
 	}
 
 	public String getVersion() {
@@ -126,57 +76,20 @@ public String getFilenameOld() {
 	public void setFilenameOld(String filenameOld) {
 		this.filenameOld = filenameOld;
 	}
+	
+	protected void copyAttributesFrom(AbstractDocumentHistory source) {
+		super.copyAttributesFrom(source);
 
-	public String getReason() {
-		return reason;
-	}
-
-	public void setReason(String reason) {
-		this.reason = reason;
-	}
-
-	public Folder getFolder() {
-		return folder;
-	}
-
-	public void setFolder(Folder folder) {
-		this.folder = folder;
-	}
-
-	public AbstractDocument getDocument() {
-		return document;
+		setDocId(source.getDocId());
 	}
-
+	
 	public void setDocument(AbstractDocument document) {
-		this.document = document;
+		super.setDocument(document);
 		if (document != null) {
-			this.setTenantId(document.getTenantId());
 			if (document instanceof Version ver)
 				this.setDocId(ver.getDocId());
 			else
-				this.setDocId(document.getId());
-
-			this.setFilename(document.getFileName());
-			this.setFileSize(document.getFileSize());
-
-			if (document instanceof Version ver)
-				this.setFolderId(ver.getFolderId());
-			else if (document instanceof Document doc)
-				this.setFolderId(doc.getFolder().getId());
+				this.setDocId(getDocument().getId());
 		}
 	}
-
-
-	protected void copyAttributesFrom(AbstractDocumentHistory source) {
-		super.copyAttributesFrom(source);
-		setVersion(source.getVersion());
-		setFileVersion(source.getFileVersion());
-		setPathOld(source.getPathOld());
-		setFilenameOld(source.getFilenameOld());
-		setDocId(source.getDocId());
-		setFolderId(source.getFolderId());
-		setReason(source.getReason());
-		setFilename(source.getFilename());
-		setFileSize(source.getFileSize());
-	}
 }

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

@@ -1,5 +1,7 @@
 package com.logicaldoc.core.history;
 
+import java.util.Objects;
+
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Transient;
@@ -21,10 +23,13 @@ public abstract class ExtendedHistory extends History {
 	public static final String ASPECT = "saveHistory";
 
 	private static final long serialVersionUID = 1L;
+	
+	@Column(name = "ld_filename", length = 255)
+	private String filename = null;
 
-	@Column(name = "ld_docid")
-	private Long docId;
-
+	@Column(name = "ld_filesize")
+	private Long fileSize = null;
+	
 	@Column(name = "ld_folderid")
 	private Long folderId;
 
@@ -34,27 +39,13 @@ public abstract class ExtendedHistory extends History {
 	@Column(name = "ld_reason", length = 4000)
 	private String reason = null;
 
-	@Column(name = "ld_filename", length = 255)
-	private String filename = null;
-
-	@Column(name = "ld_filesize")
-	private Long fileSize = null;
-
 	// Not persistent
 	@Transient
 	private AbstractDocument document;
 
 	// Not persistent
 	@Transient
 	private Folder folder;
-	
-	public Long getDocId() {
-		return docId;
-	}
-
-	public void setDocId(Long docId) {
-		this.docId = docId;
-	}
 
 	public Long getFolderId() {
 		return folderId;
@@ -92,10 +83,6 @@ public void setDocument(AbstractDocument document) {
 		this.document = document;
 		if (document != null) {
 			this.setTenantId(document.getTenantId());
-			if (document instanceof Version ver)
-				this.setDocId(ver.getDocId());
-			else
-				this.setDocId(getDocument().getId());
 
 			this.setFilename(document.getFileName());
 			this.setFileSize(document.getFileSize());
@@ -122,7 +109,6 @@ public void setFolder(Folder folder) {
 	protected void copyAttributesFrom(ExtendedHistory source) {
 		super.copyAttributesFrom(source);
 
-		setDocId(source.getDocId());
 		setFolderId(source.getFolderId());
 		setReason(source.getReason());
 		setFilename(source.getFilename());
@@ -143,8 +129,7 @@ public int compareTo(History other) {
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
-		result = prime * result + ((docId == null) ? 0 : docId.hashCode());
-		result = prime * result + ((folderId == null) ? 0 : folderId.hashCode());
+		result = prime * result + Objects.hash(folderId);
 		return result;
 	}
 
@@ -157,16 +142,6 @@ public boolean equals(Object obj) {
 		if (getClass() != obj.getClass())
 			return false;
 		ExtendedHistory other = (ExtendedHistory) obj;
-		if (docId == null) {
-			if (other.docId != null)
-				return false;
-		} else if (!docId.equals(other.docId))
-			return false;
-		if (folderId == null) {
-			if (other.folderId != null)
-				return false;
-		} else if (!folderId.equals(other.folderId))
-			return false;
-		return true;
+		return Objects.equals(folderId, other.folderId);
 	}
 }

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

@@ -40,11 +40,11 @@ public abstract class History extends PersistentObject implements Comparable<His
 
 	private static final Logger log = LoggerFactory.getLogger(History.class);
 
-	@Column(name = "ld_userid")
-	private Long userId;
-
 	@Column(name = "ld_date")
 	private Date date = new Date();
+	
+	@Column(name = "ld_userid")
+	private Long userId;
 
 	@Column(name = "ld_username", length = 255)
 	private String username = "";
@@ -61,6 +61,9 @@ public abstract class History extends PersistentObject implements Comparable<His
 	@Column(name = "ld_comment")
 	private String comment = "";
 
+	@Column(name = "ld_path")
+	private String path = null;
+	
 	/**
 	 * Used to mark this event notified by the auditing system
 	 */
@@ -73,9 +76,6 @@ public abstract class History extends PersistentObject implements Comparable<His
 	@Column(name = "ld_keylabel", length = 255)
 	private String keyLabel = "";
 
-	@Column(name = "ld_path")
-	private String path = null;
-
 	@Column(name = "ld_ip", length = 255)
 	private String ip;
 

logicaldoc-core/src/main/resources/sql/logicaldoc-core.sql

@@ -250,7 +250,8 @@ create table ld_apikey (ld_id bigint not null, ld_lastmodified timestamp not nul
                         ld_deleted int not null, ld_tenantid bigint not null, ld_userid bigint not null, ld_lastused timestamp, ld_key varchar(255) not null,
                         ld_name varchar(255) not null, ld_label varchar(255), primary key (ld_id));
 
-create table hibernate_sequences (sequence_name varchar(40) NOT NULL, next_val bigint NOT NULL, primary key (sequence_name));
+create table ld_hilo (sequence_name varchar(40) NOT NULL, next_val bigint NOT NULL, primary key (sequence_name));
+
 
 alter table ld_document add constraint FK75ED9C0276C86307 foreign key (ld_templateid) references ld_template(ld_id);
 alter table ld_document add constraint FK75ED9C027C565C60 foreign key (ld_folderid) references ld_folder(ld_id);
@@ -807,31 +808,31 @@ order by date desc',null,'docevent', 10, 1);
 insert into ld_dashlet	(ld_id, ld_lastmodified, ld_creation, ld_deleted, ld_recordversion, ld_tenantid, ld_name, ld_title, ld_query, ld_content, ld_type, ld_max, ld_unique)
 values(9,CURRENT_TIMESTAMP,CURRENT_TIMESTAMP,0,1,1,'bookmark','bookmarks','',null,'bookmark', 10, 0);
 
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_document', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_bookmark', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_generic', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_group', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_history', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_link', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_menu', 5000);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_systemmessage', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_template', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_ticket', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_user', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_user_history', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_version', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_folder', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_folder_history', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_rating', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_note', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_messagetemplate', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_tenant', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_sequence', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_extoption', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_attributeset', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_session', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_dashlet', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_device', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_password_history', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_search', 100);
-insert into hibernate_sequences(sequence_name, next_val) values ('ld_apikey', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_document', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_bookmark', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_generic', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_group', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_history', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_link', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_menu', 5000);
+insert into ld_hilo(sequence_name, next_val) values ('ld_systemmessage', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_template', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_ticket', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_user', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_user_history', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_version', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_folder', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_folder_history', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_rating', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_note', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_messagetemplate', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_tenant', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_sequence', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_extoption', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_attributeset', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_session', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_dashlet', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_device', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_password_history', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_search', 100);
+insert into ld_hilo(sequence_name, next_val) values ('ld_apikey', 100);