#2021 feature - Added changes on client to use PackID and other changes rel...

rsanchez

2014-10-22 09bb2b3b9300e332f8b743481fbb412df8cd2a89

 src/main/java/net/curisit/securis/beans/LicenseBean.java
..
..
@@ -10,94 +10,97 @@
10
10
 import org.codehaus.jackson.annotate.JsonPropertyOrder;
11
11
 
12
12
 @JsonAutoDetect
13
-@JsonPropertyOrder(
14
-	{ "licenseCode", "licenseType", "expirationDate", "appCode", "arch", "osName", "customerCode", "macAddresses", "crcLogo", "metadata" })
13
+@JsonPropertyOrder({
14
+        "appName", "licenseCode", "licenseTypeCode", "expirationDate", "arch", "osName", "customerCode", "macAddresses", "crcLogo", "metadata"
15
+})
15
16
 public class LicenseBean extends RequestBean {
16
-	private Date expirationDate;
17
-	/**
18
-	 * Signature is stored in Base64 code
19
-	 */
20
-	private String signature;
21
-	private String licenseType;
22
-	private String licenseCode;
17
+    private Date expirationDate;
18
+    /**
19
+     * Signature is stored in Base64 code
20
+     */
21
+    private String signature;
22
+    private String licenseCode;
23
+    private String appName;
23
24
 
24
-	private Map<String, Object> metadata;
25
+    private Map<String, Object> metadata;
25
26
 
26
-	public LicenseBean() {
27
-	}
27
+    public LicenseBean() {
28
+    }
28
29
 
29
-	public LicenseBean(RequestBean req) {
30
-		super.setAppCode(req.getAppCode());
31
-		super.setArch(req.getArch());
32
-		super.setCrcLogo(req.getCrcLogo());
33
-		super.setCustomerCode(req.getCustomerCode());
34
-		super.setMacAddresses(req.getMacAddresses());
35
-		super.setOsName(req.getOsName());
36
-	}
30
+    public LicenseBean(RequestBean req) {
31
+        super.setPackCode(req.getPackCode());
32
+        super.setLicenseTypeCode(req.getLicenseTypeCode());
33
+        super.setCustomerCode(req.getCustomerCode());
34
+        super.setArch(req.getArch());
35
+        super.setCrcLogo(req.getCrcLogo());
36
+        super.setMacAddresses(req.getMacAddresses());
37
+        super.setOsName(req.getOsName());
38
+    }
37
39
 
38
-	public Map<String, Object> getMetadata() {
39
-		return metadata;
40
-	}
40
+    public Map<String, Object> getMetadata() {
41
+        return metadata;
42
+    }
41
43
 
42
-	public void setMetadata(Map<String, Object> metadata) {
43
-		this.metadata = new TreeMap<>(metadata);
44
-	}
44
+    public void setMetadata(Map<String, Object> metadata) {
45
+        this.metadata = new TreeMap<>(metadata);
46
+    }
45
47
 
46
-	@JsonIgnore
47
-	public String getSignature() {
48
-		return signature;
49
-	}
48
+    @JsonIgnore
49
+    public String getSignature() {
50
+        return signature;
51
+    }
50
52
 
51
-	@JsonProperty("signature")
52
-	public void setSignature(String signature) {
53
-		this.signature = signature;
54
-	}
53
+    @JsonProperty("signature")
54
+    public void setSignature(String signature) {
55
+        this.signature = signature;
56
+    }
55
57
 
56
-	public Date getExpirationDate() {
57
-		return expirationDate;
58
-	}
58
+    public Date getExpirationDate() {
59
+        return expirationDate;
60
+    }
59
61
 
60
-	public void setExpirationDate(Date expirationDate) {
61
-		this.expirationDate = expirationDate;
62
-	}
62
+    public void setExpirationDate(Date expirationDate) {
63
+        this.expirationDate = expirationDate;
64
+    }
63
65
 
64
-	@Override
65
-	public int hashCode() {
66
-		int code = 0;
67
-		code += expirationDate != null ? expirationDate.hashCode() : 0;
68
-		code += signature != null ? signature.hashCode() : 0;
69
-		code += metadata != null ? metadata.hashCode() : 0;
70
-		
71
-		return code;
72
-	};
73
-	
74
-	@Override
75
-	public boolean equals(Object obj) {
76
-		if (!(obj instanceof LicenseBean))
77
-			return false;
78
-		LicenseBean rb = (LicenseBean) obj;
79
-		boolean result = true;
80
-		result = result && ((expirationDate == null && rb.expirationDate == null) || (expirationDate != null && expirationDate.equals(rb.expirationDate)));
81
-		result = result && ((signature == null && rb.signature == null) || (signature != null && signature.equals(rb.signature)));
82
-		result = result && ((metadata == null && rb.metadata == null) || (metadata != null && metadata.equals(rb.metadata)));
66
+    @Override
67
+    public int hashCode() {
68
+        int code = 0;
69
+        code += expirationDate != null ? expirationDate.hashCode() : 0;
70
+        code += signature != null ? signature.hashCode() : 0;
71
+        code += metadata != null ? metadata.hashCode() : 0;
83
72
 
84
-		return result && super.equals(obj);
85
-	}
73
+        return code;
74
+    };
86
75
 
87
-	public String getLicenseCode() {
88
-		return licenseCode;
89
-	}
76
+    @Override
77
+    public boolean equals(Object obj) {
78
+        if (!(obj instanceof LicenseBean))
79
+            return false;
80
+        LicenseBean rb = (LicenseBean) obj;
81
+        boolean result = true;
82
+        result = result
83
+                && ((expirationDate == null && rb.expirationDate == null) || (expirationDate != null && expirationDate.equals(rb.expirationDate)));
84
+        result = result && ((signature == null && rb.signature == null) || (signature != null && signature.equals(rb.signature)));
85
+        result = result && ((metadata == null && rb.metadata == null) || (metadata != null && metadata.equals(rb.metadata)));
90
86
 
91
-	public void setLicenseCode(String licenseCode) {
92
-		this.licenseCode = licenseCode;
93
-	}
87
+        return result && super.equals(obj);
88
+    }
94
89
 
95
-	public String getLicenseType() {
96
-		return licenseType;
97
-	}
90
+    public String getLicenseCode() {
91
+        return licenseCode;
92
+    }
98
93
 
99
-	public void setLicenseType(String licenseType) {
100
-		this.licenseType = licenseType;
101
-	}
94
+    public void setLicenseCode(String licenseCode) {
95
+        this.licenseCode = licenseCode;
96
+    }
97
+
98
+    public String getAppName() {
99
+        return appName;
100
+    }
101
+
102
+    public void setAppName(String appName) {
103
+        this.appName = appName;
104
+    }
102
105
 
103
106
 }