JPA annotations

Author: gdesiato

logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/LDRepository.java

@@ -545,7 +545,12 @@ public void appendContent(CallContext context, String documentId, ContentStream
 		log.debug("appendContent {}", documentId);
 		AbstractDocument doc = getDocument(documentId);
 
-		validatePermission(ID_PREFIX_FLD + doc.getFolder().getId(), context, Permission.WRITE);
+		long folderId = 0L;
+		if (doc instanceof Document document)
+			folderId = document.getFolder().getId();
+		else if (doc instanceof Version version)
+			folderId = version.getFolderId();
+		validatePermission(ID_PREFIX_FLD + folderId, context, Permission.WRITE);
 
 		NumberFormat nd = new DecimalFormat("0000000000");
 
@@ -1213,9 +1218,9 @@ public ContentStream getContentStream(CallContext context, String objectId, BigI
 			if (doc instanceof Document document)
 				transaction.setDocument(document);
 
-			if (doc instanceof Document) {
-				transaction.setFolderId(doc.getFolder().getId());
-				transaction.setPath(folderDao.computePathExtended(doc.getFolder().getId()));
+			if (doc instanceof Document document) {
+				transaction.setFolderId(document.getFolder().getId());
+				transaction.setPath(folderDao.computePathExtended(document.getFolder().getId()));
 			} else {
 				transaction.setFolderId(((Version) doc).getFolderId());
 				transaction.setPath(folderDao.computePathExtended(((Version) doc).getFolderId()));
@@ -1431,7 +1436,7 @@ public List<ObjectParentData> getObjectParents(CallContext context, String objec
 				compileObjectType(context, object, null, false, false, objectInfos);
 
 			Folder parent;
-			if (object instanceof AbstractDocument document)
+			if (object instanceof Document document)
 				parent = document.getFolder();
 			else
 				parent = folderDao.findFolder(((Folder) object).getParentId());
@@ -1916,8 +1921,14 @@ private void compileDocumentOrVersionProperties(AbstractDocument doc, ObjectInfo
 		addPropertyBoolean(result, typeId, filter, PropertyIds.IS_IMMUTABLE, doc.getImmutable() != 0);
 
 		addPropertyString(result, typeId, filter, TypeManager.PROP_LANGUAGE, doc.getLanguage());
-		addPropertyInteger(result, typeId, filter, TypeManager.PROP_RATING,
-				doc.getRating() != null ? doc.getRating() : 0);
+
+		if (doc instanceof Document document) {
+			addPropertyInteger(result, typeId, filter, TypeManager.PROP_RATING,
+					document.getRating() != null ? document.getRating() : 0);
+		} else {
+			addPropertyInteger(result, typeId, filter, TypeManager.PROP_RATING, 0);
+		}
+		
 		addPropertyString(result, typeId, filter, TypeManager.PROP_FILEVERSION, doc.getFileVersion());
 		addPropertyString(result, typeId, filter, TypeManager.PROP_VERSION, doc.getVersion());
 		addPropertyString(result, typeId, filter, TypeManager.PROP_CUSTOMID, doc.getCustomId());
@@ -2126,14 +2137,16 @@ private void updateDocumentLocale(AbstractDocument doc, PropertyData<?> p) {
 	}
 
 	private void updateDocumentTags(AbstractDocument doc, PropertyData<?> p) {
-		doc.getTags().clear();
-		doc.setTgs((String) p.getFirstValue());
-		if (doc.getTgs() != null) {
-			StringTokenizer st = new StringTokenizer(doc.getTgs(), ",", false);
-			while (st.hasMoreTokens()) {
-				String tg = st.nextToken();
-				if (StringUtils.isNotEmpty(tg))
-					doc.addTag(tg);
+		if (doc instanceof Document document) {
+			document.getTags().clear();
+			document.setTgs((String) p.getFirstValue());
+			if (document.getTgs() != null) {
+				StringTokenizer st = new StringTokenizer(document.getTgs(), ",", false);
+				while (st.hasMoreTokens()) {
+					String tg = st.nextToken();
+					if (StringUtils.isNotEmpty(tg))
+						document.addTag(tg);
+				}
 			}
 		}
 	}

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

@@ -15,6 +15,7 @@
 import com.logicaldoc.core.RunLevel;
 import com.logicaldoc.core.document.Document;
 import com.logicaldoc.core.document.DocumentDAO;
+import com.logicaldoc.core.history.AbstractDocumentHistory;
 import com.logicaldoc.core.history.History;
 import com.logicaldoc.core.threading.ThreadPools;
 import com.logicaldoc.util.Context;

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

@@ -5,6 +5,13 @@
 import java.util.Locale;
 import java.util.Set;
 
+import javax.persistence.CollectionTable;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.JoinColumn;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
+
 import com.logicaldoc.core.PersistentObject;
 
 /**
@@ -14,6 +21,7 @@
  * @author Marco Meschieri
  * @version 1.0
  */
+@MappedSuperclass
 public abstract class Message extends PersistentObject {
 
 	private static final long serialVersionUID = 1L;
@@ -22,36 +30,47 @@ public abstract class Message extends PersistentObject {
 
 	public static final int TYPE_NOTIFICATION = 1;
 
-	private String messageText = "";
-
+	@Column(name = "ld_author", length = 255)
 	private String author = "";
+	
+	@Column(name = "ld_messagetext")
+	private String messageText = "";
 
+	@Column(name = "ld_subject", length = 255)
 	private String subject = "";
 
 	/**
 	 * When the message was sent
 	 */
+	@Column(name = "ld_sentdate", nullable = false)
 	private Date sentDate = new Date();
 
 	/**
 	 * When the message was received
 	 */
+	@Transient
 	private Date receivedDate = new Date();
 
+	@Column(name = "ld_type", nullable = false)
 	private int type = Message.TYPE_SYSTEM;
 
+	@ElementCollection
+	@CollectionTable(name = "ld_recipient", joinColumns = @JoinColumn(name = "ld_messageid"))
 	private Set<Recipient> recipients = new HashSet<>();
 
 	/**
 	 * The locale in which the message is written
 	 */
+	@Transient
 	protected Locale locale;
 
+	@Column(name = "ld_html", nullable = false)
 	protected int html = 0;
 
 	/**
 	 * A flag that can be used to specify if the message has to be notified
 	 */
+	@Transient
 	protected boolean notify = true;
 
 	public boolean isNotify() {

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

@@ -2,6 +2,14 @@
 
 import java.util.Map;
 
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
 import com.logicaldoc.core.PersistentObject;
 import com.logicaldoc.core.automation.Automation;
 import com.logicaldoc.core.automation.AutomationException;
@@ -13,6 +21,10 @@
  * @author Marco Meschieri - LogicalDOC
  * @since 6.5
  */
+@Entity
+@Table(name = "ld_messagetemplate")
+@Cacheable
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class MessageTemplate extends PersistentObject {
 
 	private static final long serialVersionUID = 1L;
@@ -21,16 +33,22 @@ public class MessageTemplate extends PersistentObject {
 
 	public static final String TYPE_USER = "user";
 
+	@Column(name = "ld_name", length = 255, nullable = false)
 	private String name = "";
 
-	private String description = "";
-
+	@Column(name = "ld_language", length = 10, nullable = false)
 	private String language = "en";
+	
+	@Column(name = "ld_description", length = 1000)
+	private String description = "";
 
+	@Column(name = "ld_body", length = 4000)
 	private String body;
 
+	@Column(name = "ld_subject", length = 1000)
 	private String subject;
 
+	@Column(name = "ld_type", length = 255)
 	private String type = TYPE_SYSTEM;
 
 	public MessageTemplate() {

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

@@ -2,13 +2,17 @@
 
 import java.io.Serializable;
 
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+
 import org.apache.commons.lang3.StringUtils;
 
 /**
  * A generic recipient of a message or email
  * 
  * @author Michael Scholz
  */
+@Embeddable
 public class Recipient implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -26,18 +30,23 @@ public class Recipient implements Serializable {
 	public static final String MODE_EMAIL_REPLYTO = "REPLYTO";
 
 	// The login
+	@Column(name = "ld_name", nullable = false)
 	private String name = "";
 
 	// The system login or the email address
+	@Column(name = "ld_address", nullable = false)
 	private String address = "";
 
 	// The recipient mode (for the system message is not useful, for the email
 	// can be To, CC, CCN, ecc.)
+	@Column(name = "ld_mode", nullable = false)
 	private String mode = MODE_EMAIL_TO;
 
 	// The recipient type (i.e. system, user, group, email)
+	@Column(name = "ld_type", nullable = false)
 	private int type = TYPE_SYSTEM;
 
+	@Column(name = "ld_read", nullable = false)
 	private int read = 0;
 
 	public Recipient(String name, String address) {
@@ -84,7 +93,7 @@ public boolean equals(Object arg0) {
 
 	@Override
 	public int hashCode() {
-		return  address.hashCode();
+		return address.hashCode();
 	}
 
 	public String getMode() {

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

@@ -4,6 +4,14 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
 /**
  * SystemMessages are messages which an user only can send to other system
  * users.
@@ -12,6 +20,10 @@
  * @author Marco Meschieri - LogicalDOC
  * @since 1.0
  */
+@Entity
+@Table(name = "ld_systemmessage")
+@Cacheable
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class SystemMessage extends Message {
 
 	private static final long serialVersionUID = 1L;
@@ -22,25 +34,31 @@ public class SystemMessage extends Message {
 
 	public static final int STATUS_ERROR = 2;
 
+	@Column(name = "ld_datescope")
 	private int dateScope = 10;
 
 	/**
 	 * A priority: <b>0</b> = low, <b>1</b> = medium, <b>2</b> = high
 	 */
+	@Column(name = "ld_prio")
 	private int prio = 0;
 
+	@Column(name = "ld_confirmation")
 	private int confirmation = 0; // 0 - false; 1 - true
 
 	/**
 	 * The date this message was last notified
 	 */
+	@Column(name = "ld_lastnotified")
 	private Date lastNotified = null;
 
+	@Column(name = "ld_status", nullable = false)
 	private int status = STATUS_NEW;
 
 	/**
 	 * The number of notification trials
 	 */
+	@Column(name = "ld_trials")
 	private int trials = 0;
 
 	public SystemMessage() {

logicaldoc-core/src/main/java/com/logicaldoc/core/conversion/FormatConverterManager.java

@@ -322,8 +322,7 @@ public void convertFile(File in, String inFilename, File out, String outFormat,
 				history.setEvent(UserEvent.FILE_CONVERSION.toString());
 				history.setFilename(FileUtil.getBaseName(inFilename) + "." + outFormat.toLowerCase());
 				history.setFileSize(in.length());
-				history.setFilenameOld(inFilename);
-				history.setComment(String.format("%s -> %s", history.getFilenameOld(), history.getFilename()));
+				history.setComment(String.format("%s -> %s", inFilename, history.getFilename()));
 				history.setIp(session.getClient().getAddress());
 
 				UserHistoryDAO dao = Context.get(UserHistoryDAO.class);