From f1965e6375e2e556f642f6002b4bb5add8a20ab8 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Fri, 21 Feb 2014 17:53:08 +0000
Subject: [PATCH] #0 feature - Added more License fields, metadata section for application specific data

---
 src/main/java/net/curisit/securis/beans/LicenseBean.java |   47 ++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/curisit/securis/beans/LicenseBean.java b/src/main/java/net/curisit/securis/beans/LicenseBean.java
index 691241d..e009277 100644
--- a/src/main/java/net/curisit/securis/beans/LicenseBean.java
+++ b/src/main/java/net/curisit/securis/beans/LicenseBean.java
@@ -1,18 +1,24 @@
 package net.curisit.securis.beans;
 
 import java.util.Date;
+import java.util.Map;
+import java.util.TreeMap;
 
+import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonPropertyOrder;
 
 @JsonPropertyOrder(
-	{ "maxUsers", "expirationDate", "appCode", "arch", "osName", "customerCode", "macAddresses", "crclogo" })
+	{ "licenseCode", "licenseType", "expirationDate", "appCode", "arch", "osName", "customerCode", "macAddresses", "crcLogo", "metadata" })
 public class LicenseBean extends RequestBean {
-	private int maxUsers;
 	private Date expirationDate;
 	/**
 	 * Signature is stored in Base64 code
 	 */
 	private String signature;
+	private String licenseType;
+	private String licenseCode;
+
+	private Map<String, Object> metadata;
 
 	public LicenseBean() {
 	}
@@ -26,6 +32,15 @@
 		super.setOsName(req.getOsName());
 	}
 
+	public Map<String, Object> getMetadata() {
+		return metadata;
+	}
+
+	public void setMetadata(Map<String, Object> metadata) {
+		this.metadata = new TreeMap<>(metadata);
+	}
+
+	@JsonIgnore
 	public String getSignature() {
 		return signature;
 	}
@@ -42,23 +57,33 @@
 		this.expirationDate = expirationDate;
 	}
 
-	public int getMaxUsers() {
-		return maxUsers;
-	}
-
-	public void setMaxUsers(int maxUsers) {
-		this.maxUsers = maxUsers;
-	}
-
 	@Override
 	public boolean equals(Object obj) {
 		if (!(obj instanceof LicenseBean))
 			return false;
 		LicenseBean rb = (LicenseBean) obj;
-		boolean result = (maxUsers == rb.maxUsers);
+		boolean result = true;
 		result = result && ((expirationDate == null && rb.expirationDate == null) || (expirationDate != null && expirationDate.equals(rb.expirationDate)));
 		result = result && ((signature == null && rb.signature == null) || (signature != null && signature.equals(rb.signature)));
+		result = result && ((metadata == null && rb.metadata == null) || (metadata != null && metadata.equals(rb.metadata)));
 
 		return result && super.equals(obj);
 	}
+
+	public String getLicenseCode() {
+		return licenseCode;
+	}
+
+	public void setLicenseCode(String licenseCode) {
+		this.licenseCode = licenseCode;
+	}
+
+	public String getLicenseType() {
+		return licenseType;
+	}
+
+	public void setLicenseType(String licenseType) {
+		this.licenseType = licenseType;
+	}
+
 }

--
Gitblit v1.3.2