Newly annotated classes: Dashlet, Rating, Apikey, Device, AttributeOption

Author: gdesiato

logicaldoc-core/src/main/java/com/logicaldoc/core/dashlet/Dashlet.java

@@ -1,5 +1,13 @@
 package com.logicaldoc.core.dashlet;
 
+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;
 
 /**
@@ -8,6 +16,10 @@
  * @author Marco Meschieri - LogicalDOC
  * @since 8.2.3
  */
+@Entity
+@Table(name = "ld_dashlet")
+@Cacheable
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class Dashlet extends PersistentObject {
 
 	private static final long serialVersionUID = 1L;
@@ -22,23 +34,31 @@ public class Dashlet extends PersistentObject {
 
 	public static final String TYPE_CONTENT = "content";
 
-	private String type = TYPE_DOCEVENT;
-
-	private String query;
-
-	private String content;
-
+	@Column(name = "ld_name", length = 255, nullable = false)
 	private String name;
-
+	
+	@Column(name = "ld_title", length = 255, nullable = false)
 	private String title;
-
+	
+	@Column(name = "ld_type", length = 255, nullable = false)
+	private String type = TYPE_DOCEVENT;
+	
+	@Column(name = "ld_max")
 	private Integer max;
 
 	/**
 	 * To mark that it must display just unique records
 	 */
+	@Column(name = "ld_unique", nullable = false)
 	private int unique = 0;
+	
+	@Column(name = "ld_query")
+	private String query;
+
+	@Column(name = "ld_content")
+	private String content;
 
+	@Column(name = "ld_columns")
 	private String columns;
 
 	public Dashlet() {

logicaldoc-core/src/main/java/com/logicaldoc/core/document/Rating.java

@@ -1,5 +1,14 @@
 package com.logicaldoc.core.document;
 
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
 import com.logicaldoc.core.PersistentObject;
 
 /**
@@ -8,20 +17,30 @@
  * @author Matteo Caruso - LogicalDOC
  * @since 6.1
  */
+@Entity
+@Table(name = "ld_rating")
+@Cacheable
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class Rating extends PersistentObject {
 
 	private static final long serialVersionUID = 1L;
 
+	@Column(name = "ld_docid", nullable = false)
 	private long docId;
 
+	@Column(name = "ld_userid", nullable = false)
 	private long userId;
 
+	@Column(name = "ld_username", length = 255)
+	private String username;
+	
+	@Column(name = "ld_vote", nullable = false)
 	private int vote = 0;
 
+	@Transient
 	private Integer count;
 
-	private String username;
-
+	@Transient
 	private Float average;
 
 	public long getUserId() {

logicaldoc-core/src/main/java/com/logicaldoc/core/metadata/AttributeOption.java

@@ -1,5 +1,13 @@
 package com.logicaldoc.core.metadata;
 
+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;
 
 /**
@@ -8,26 +16,36 @@
  * @author Marco Meschieri - LogicalDOC
  * @since 7.1
  */
+@Entity
+@Table(name = "ld_extoption")
+@Cacheable
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class AttributeOption extends PersistentObject implements Comparable<AttributeOption> {
 
 	private static final long serialVersionUID = 1L;
 
+	@Column(name = "ld_setid", nullable = false)
 	private long setId;
 
+	@Column(name = "ld_attribute", nullable = false)
 	private String attribute;
 
-	/**
-	 * An category, just to organize the values in groups
-	 */
-	private String category;
-
 	/**
 	 * The value of this option
 	 */
+	@Column(name = "ld_value", nullable = false)
 	private String value;
+	
+	/**
+	 * An category, just to organize the values in groups
+	 */
+	@Column(name = "ld_category", nullable = false)
+	private String category;
 
+	@Column(name = "ld_label", nullable = false)
 	private String label;
 
+	@Column(name = "ld_position", nullable = false)
 	private int position = 0;
 
 	public AttributeOption() {

logicaldoc-core/src/main/java/com/logicaldoc/core/security/Device.java

@@ -3,10 +3,16 @@
 import java.io.Serializable;
 import java.util.Date;
 
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import com.logicaldoc.core.PersistentObject;
 
@@ -18,6 +24,10 @@
  * @author Marco Meschieri - LogicalDOC
  * @since 8.5.3
  */
+@Entity
+@Table(name = "ld_device")
+@Cacheable
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class Device extends PersistentObject implements Serializable {
 
 	public static final String PARAM_DEVICE = "device";
@@ -27,47 +37,58 @@ public class Device extends PersistentObject implements Serializable {
 	/**
 	 * A unique identifier of the device
 	 */
+	@Column(name = "ld_deviceid", length = 255, nullable = false)
 	private String deviceId;
 
+	@Column(name = "ld_userid")
+	private long userId;
+	
+	@Column(name = "ld_username", length = 255)
+	private String username;
+	
 	/**
 	 * Name of the browser
 	 */
+	@Column(name = "ld_browser", length = 255)
 	private String browser = "unknown";
-
+	
 	/**
 	 * Version of the browser
 	 */
+	@Column(name = "ld_browserversion", length = 255)
 	private String browserVersion;
 
 	/**
 	 * Name of the operative system
 	 */
+	@Column(name = "ld_operativesystem", length = 255)
 	private String operativeSystem;
 
 	/**
 	 * Type of device
 	 */
+	@Column(name = "ld_type", length = 255)
 	private String type;
 
 	/**
 	 * Instant of last login
 	 */
+	@Column(name = "ld_lastlogin")
 	private Date lastLogin;
 
+	@Column(name = "ld_trusted", nullable = false)
+	private int trusted = 0;
+	
 	/**
 	 * IP of last login
 	 */
+	@Column(name = "ld_ip", length = 255)
 	private String ip;
 
-	private long userId;
-
-	private String username;
-
-	private int trusted = 0;
-
 	/**
 	 * Optional label assigned to the device
 	 */
+	@Column(name = "ld_label", length = 255)
 	private String label;
 
 	public Device() {
@@ -81,7 +102,7 @@ public Device() {
 	 */
 	public Device(HttpServletRequest request) {
 		setDeviceId(getDeviceId(request));
-		
+
 		UserAgent agent = UserAgent.parseUserAgentString(request.getHeader("User-Agent"));
 		setBrowser(agent.getBrowser().getName());
 

logicaldoc-core/src/main/java/com/logicaldoc/core/security/apikey/ApiKey.java

@@ -3,7 +3,15 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.Date;
 
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
 import org.apache.commons.lang.StringUtils;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import com.logicaldoc.core.PersistentObject;
 import com.logicaldoc.util.crypt.CryptUtil;
@@ -14,20 +22,30 @@
  * @author Marco Meschieri - LogicalDOC
  * @since 8.9.4
  */
+@Entity
+@Table(name = "ld_apikey")
+@Cacheable
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class ApiKey extends PersistentObject {
 
 	private static final long serialVersionUID = 1L;
 
+	@Column(name = "ld_userid", nullable = false)
 	private long userId;
 
+	@Column(name = "ld_name", length = 255, nullable = false)
 	private String name;
 
-	private String label;
-
+	@Column(name = "ld_lastused")
 	private Date lastUsed;
-
+	
+	@Column(name = "ld_key", length = 255, nullable = false)
 	private String key;
+	
+	@Column(name = "ld_label", length = 255, nullable = false)
+	private String label;
 
+	@Transient
 	private String decodedKey;
 
 	public ApiKey() {