#0 feature - Added more License fields, metadata section for application sp...

Roberto Sánchez

2014-02-21 f1965e6375e2e556f642f6002b4bb5add8a20ab8

 src/main/java/net/curisit/securis/beans/LicenseBean.java
..
..
@@ -1,18 +1,24 @@
1
1
 package net.curisit.securis.beans;
2
2
 
3
3
 import java.util.Date;
4
+import java.util.Map;
5
+import java.util.TreeMap;
4
6
 
7
+import org.codehaus.jackson.annotate.JsonIgnore;
5
8
 import org.codehaus.jackson.annotate.JsonPropertyOrder;
6
9
 
7
10
 @JsonPropertyOrder(
8
-	{ "maxUsers", "expirationDate", "appCode", "arch", "osName", "customerCode", "macAddresses", "crclogo" })
11
+	{ "licenseCode", "licenseType", "expirationDate", "appCode", "arch", "osName", "customerCode", "macAddresses", "crcLogo", "metadata" })
9
12
 public class LicenseBean extends RequestBean {
10
-	private int maxUsers;
11
13
 	private Date expirationDate;
12
14
 	/**
13
15
 	 * Signature is stored in Base64 code
14
16
 	 */
15
17
 	private String signature;
18
+	private String licenseType;
19
+	private String licenseCode;
20
+
21
+	private Map<String, Object> metadata;
16
22
 
17
23
 	public LicenseBean() {
18
24
 	}
..
..
@@ -26,6 +32,15 @@
26
32
 		super.setOsName(req.getOsName());
27
33
 	}
28
34
 
35
+	public Map<String, Object> getMetadata() {
36
+		return metadata;
37
+	}
38
+
39
+	public void setMetadata(Map<String, Object> metadata) {
40
+		this.metadata = new TreeMap<>(metadata);
41
+	}
42
+
43
+	@JsonIgnore
29
44
 	public String getSignature() {
30
45
 		return signature;
31
46
 	}
..
..
@@ -42,23 +57,33 @@
42
57
 		this.expirationDate = expirationDate;
43
58
 	}
44
59
 
45
-	public int getMaxUsers() {
46
-		return maxUsers;
47
-	}
48
-
49
-	public void setMaxUsers(int maxUsers) {
50
-		this.maxUsers = maxUsers;
51
-	}
52
-
53
60
 	@Override
54
61
 	public boolean equals(Object obj) {
55
62
 		if (!(obj instanceof LicenseBean))
56
63
 			return false;
57
64
 		LicenseBean rb = (LicenseBean) obj;
58
-		boolean result = (maxUsers == rb.maxUsers);
65
+		boolean result = true;
59
66
 		result = result && ((expirationDate == null && rb.expirationDate == null) || (expirationDate != null && expirationDate.equals(rb.expirationDate)));
60
67
 		result = result && ((signature == null && rb.signature == null) || (signature != null && signature.equals(rb.signature)));
68
+		result = result && ((metadata == null && rb.metadata == null) || (metadata != null && metadata.equals(rb.metadata)));
61
69
 
62
70
 		return result && super.equals(obj);
63
71
 	}
72
+
73
+	public String getLicenseCode() {
74
+		return licenseCode;
75
+	}
76
+
77
+	public void setLicenseCode(String licenseCode) {
78
+		this.licenseCode = licenseCode;
79
+	}
80
+
81
+	public String getLicenseType() {
82
+		return licenseType;
83
+	}
84
+
85
+	public void setLicenseType(String licenseType) {
86
+		this.licenseType = licenseType;
87
+	}
88
+
64
89
 }