From 09bb2b3b9300e332f8b743481fbb412df8cd2a89 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 22 Oct 2014 16:07:15 +0000
Subject: [PATCH] #2021 feature - Added changes on client to use PackID and other changes related with license file fields
---
src/main/java/net/curisit/securis/beans/LicenseBean.java | 149 +++++++++++++++++++++++++------------------------
1 files changed, 76 insertions(+), 73 deletions(-)
diff --git a/src/main/java/net/curisit/securis/beans/LicenseBean.java b/src/main/java/net/curisit/securis/beans/LicenseBean.java
index 4fbdbcd..6fad59c 100644
--- a/src/main/java/net/curisit/securis/beans/LicenseBean.java
+++ b/src/main/java/net/curisit/securis/beans/LicenseBean.java
@@ -10,94 +10,97 @@
import org.codehaus.jackson.annotate.JsonPropertyOrder;
@JsonAutoDetect
-@JsonPropertyOrder(
- { "licenseCode", "licenseType", "expirationDate", "appCode", "arch", "osName", "customerCode", "macAddresses", "crcLogo", "metadata" })
+@JsonPropertyOrder({
+ "appName", "licenseCode", "licenseTypeCode", "expirationDate", "arch", "osName", "customerCode", "macAddresses", "crcLogo", "metadata"
+})
public class LicenseBean extends RequestBean {
- private Date expirationDate;
- /**
- * Signature is stored in Base64 code
- */
- private String signature;
- private String licenseType;
- private String licenseCode;
+ private Date expirationDate;
+ /**
+ * Signature is stored in Base64 code
+ */
+ private String signature;
+ private String licenseCode;
+ private String appName;
- private Map<String, Object> metadata;
+ private Map<String, Object> metadata;
- public LicenseBean() {
- }
+ public LicenseBean() {
+ }
- public LicenseBean(RequestBean req) {
- super.setAppCode(req.getAppCode());
- super.setArch(req.getArch());
- super.setCrcLogo(req.getCrcLogo());
- super.setCustomerCode(req.getCustomerCode());
- super.setMacAddresses(req.getMacAddresses());
- super.setOsName(req.getOsName());
- }
+ public LicenseBean(RequestBean req) {
+ super.setPackCode(req.getPackCode());
+ super.setLicenseTypeCode(req.getLicenseTypeCode());
+ super.setCustomerCode(req.getCustomerCode());
+ super.setArch(req.getArch());
+ super.setCrcLogo(req.getCrcLogo());
+ super.setMacAddresses(req.getMacAddresses());
+ super.setOsName(req.getOsName());
+ }
- public Map<String, Object> getMetadata() {
- return metadata;
- }
+ public Map<String, Object> getMetadata() {
+ return metadata;
+ }
- public void setMetadata(Map<String, Object> metadata) {
- this.metadata = new TreeMap<>(metadata);
- }
+ public void setMetadata(Map<String, Object> metadata) {
+ this.metadata = new TreeMap<>(metadata);
+ }
- @JsonIgnore
- public String getSignature() {
- return signature;
- }
+ @JsonIgnore
+ public String getSignature() {
+ return signature;
+ }
- @JsonProperty("signature")
- public void setSignature(String signature) {
- this.signature = signature;
- }
+ @JsonProperty("signature")
+ public void setSignature(String signature) {
+ this.signature = signature;
+ }
- public Date getExpirationDate() {
- return expirationDate;
- }
+ public Date getExpirationDate() {
+ return expirationDate;
+ }
- public void setExpirationDate(Date expirationDate) {
- this.expirationDate = expirationDate;
- }
+ public void setExpirationDate(Date expirationDate) {
+ this.expirationDate = expirationDate;
+ }
- @Override
- public int hashCode() {
- int code = 0;
- code += expirationDate != null ? expirationDate.hashCode() : 0;
- code += signature != null ? signature.hashCode() : 0;
- code += metadata != null ? metadata.hashCode() : 0;
-
- return code;
- };
-
- @Override
- public boolean equals(Object obj) {
- if (!(obj instanceof LicenseBean))
- return false;
- LicenseBean rb = (LicenseBean) obj;
- 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)));
+ @Override
+ public int hashCode() {
+ int code = 0;
+ code += expirationDate != null ? expirationDate.hashCode() : 0;
+ code += signature != null ? signature.hashCode() : 0;
+ code += metadata != null ? metadata.hashCode() : 0;
- return result && super.equals(obj);
- }
+ return code;
+ };
- public String getLicenseCode() {
- return licenseCode;
- }
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof LicenseBean))
+ return false;
+ LicenseBean rb = (LicenseBean) obj;
+ 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)));
- public void setLicenseCode(String licenseCode) {
- this.licenseCode = licenseCode;
- }
+ return result && super.equals(obj);
+ }
- public String getLicenseType() {
- return licenseType;
- }
+ public String getLicenseCode() {
+ return licenseCode;
+ }
- public void setLicenseType(String licenseType) {
- this.licenseType = licenseType;
- }
+ public void setLicenseCode(String licenseCode) {
+ this.licenseCode = licenseCode;
+ }
+
+ public String getAppName() {
+ return appName;
+ }
+
+ public void setAppName(String appName) {
+ this.appName = appName;
+ }
}
--
Gitblit v1.3.2