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/RequestBean.java | 182 ++++++++++++++++++++++++---------------------
1 files changed, 97 insertions(+), 85 deletions(-)
diff --git a/src/main/java/net/curisit/securis/beans/RequestBean.java b/src/main/java/net/curisit/securis/beans/RequestBean.java
index 79ae171..2a79911 100644
--- a/src/main/java/net/curisit/securis/beans/RequestBean.java
+++ b/src/main/java/net/curisit/securis/beans/RequestBean.java
@@ -8,107 +8,119 @@
@JsonAutoDetect
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
public class RequestBean {
- private String customerCode;
- private String crcLogo;
- private String appCode;
- private List<String> macAddresses;
- private String osName;
- private String arch;
+ private String customerCode;
+ private String crcLogo;
+ private String licenseTypeCode;
+ private String packCode;
+ private List<String> macAddresses;
+ private String osName;
+ private String arch;
- public String getCustomerCode() {
- return customerCode;
- }
+ public String getCustomerCode() {
+ return customerCode;
+ }
- public void setCustomerCode(String customerCode) {
- this.customerCode = customerCode;
- }
+ public void setCustomerCode(String customerCode) {
+ this.customerCode = customerCode;
+ }
- public String getCrcLogo() {
- return crcLogo;
- }
+ public String getCrcLogo() {
+ return crcLogo;
+ }
- public void setCrcLogo(String crcLogo) {
- this.crcLogo = crcLogo;
- }
+ public void setCrcLogo(String crcLogo) {
+ this.crcLogo = crcLogo;
+ }
- public String getAppCode() {
- return appCode;
- }
+ public List<String> getMacAddresses() {
+ return macAddresses;
+ }
- public void setAppCode(String appCode) {
- this.appCode = appCode;
- }
+ public void setMacAddresses(List<String> macAddresses) {
+ this.macAddresses = macAddresses;
+ }
- public List<String> getMacAddresses() {
- return macAddresses;
- }
+ public String getOsName() {
+ return osName;
+ }
- public void setMacAddresses(List<String> macAddresses) {
- this.macAddresses = macAddresses;
- }
+ public void setOsName(String osName) {
+ this.osName = osName;
+ }
- public String getOsName() {
- return osName;
- }
+ public String getArch() {
+ return arch;
+ }
- public void setOsName(String osName) {
- this.osName = osName;
- }
+ public void setArch(String arch) {
+ this.arch = arch;
+ }
- public String getArch() {
- return arch;
- }
+ public boolean match(RequestBean rb) {
- public void setArch(String arch) {
- this.arch = arch;
- }
+ boolean result = licenseTypeCode != null && licenseTypeCode.equals(rb.licenseTypeCode);
+ result = result && (packCode != null && packCode.equals(rb.packCode));
+ result = result && (arch != null && arch.equals(rb.arch));
+ // CRC Logo validation is optional, only if request file contains it
+ result = result && (crcLogo == null || crcLogo.equals(rb.crcLogo));
+ result = result && (customerCode != null && customerCode.equals(rb.customerCode));
+ result = result && (osName != null && osName.equals(rb.osName));
+ result = result && (macAddresses != null && rb.macAddresses != null) && anyMacIsIncluded(rb.getMacAddresses());
- public boolean match(RequestBean rb) {
+ return result;
+ }
- boolean result = appCode != null && appCode.equals(rb.appCode);
- result = result && (arch != null && arch.equals(rb.arch));
- // CRC Logo validation is optional, only if request file contains it
- result = result && (crcLogo == null || crcLogo.equals(rb.crcLogo));
- result = result && (customerCode != null && customerCode.equals(rb.customerCode));
- result = result && (osName != null && osName.equals(rb.osName));
- result = result && (macAddresses != null && rb.macAddresses != null) && anyMacIsIncluded(rb.getMacAddresses());
+ private boolean anyMacIsIncluded(List<String> macList) {
+ for (String mac : macList) {
+ if (macAddresses.contains(mac))
+ return true;
+ }
+ return false;
+ }
- return result;
- }
+ @Override
+ public int hashCode() {
+ int code = 0;
+ code += licenseTypeCode != null ? licenseTypeCode.hashCode() : 0;
+ code += arch != null ? arch.hashCode() : 0;
+ code += crcLogo != null ? crcLogo.hashCode() : 0;
+ code += packCode != null ? packCode.hashCode() : 0;
+ code += customerCode != null ? customerCode.hashCode() : 0;
+ code += osName != null ? osName.hashCode() : 0;
+ code += macAddresses != null ? macAddresses.hashCode() : 0;
- private boolean anyMacIsIncluded(List<String> macList) {
- for (String mac : macList) {
- if (macAddresses.contains(mac))
- return true;
- }
- return false;
- }
+ return code;
+ };
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof RequestBean))
+ return false;
+ RequestBean rb = (RequestBean) obj;
+ boolean result = (rb.licenseTypeCode == null && licenseTypeCode == null)
+ || (licenseTypeCode != null && licenseTypeCode.equals(rb.licenseTypeCode));
+ result = result && ((rb.packCode == null && packCode == null) || (packCode != null && packCode.equals(rb.arch)));
+ result = result && ((rb.arch == null && arch == null) || (arch != null && arch.equals(rb.arch)));
+ result = result && ((rb.crcLogo == null && crcLogo == null) || (crcLogo != null && crcLogo.equals(rb.crcLogo)));
+ result = result && ((rb.customerCode == null && customerCode == null) || (customerCode != null && customerCode.equals(rb.customerCode)));
+ result = result && ((rb.osName == null && osName == null) || (osName != null && osName.equals(rb.osName)));
+ result = result && ((rb.macAddresses == null && macAddresses == null) || (macAddresses != null && macAddresses.equals(rb.macAddresses)));
+ return result;
+ }
- @Override
- public int hashCode() {
- int code = 0;
- code += appCode != null ? appCode.hashCode() : 0;
- code += arch != null ? arch.hashCode() : 0;
- code += crcLogo != null ? crcLogo.hashCode() : 0;
- code += customerCode != null ? customerCode.hashCode() : 0;
- code += osName != null ? osName.hashCode() : 0;
- code += macAddresses != null ? macAddresses.hashCode() : 0;
-
- return code;
- };
-
- @Override
- public boolean equals(Object obj) {
- if (!(obj instanceof RequestBean))
- return false;
- RequestBean rb = (RequestBean) obj;
- boolean result = (rb.appCode == null && appCode == null) || (appCode != null && appCode.equals(rb.appCode));
- result = result && ((rb.arch == null && arch == null) || (arch != null && arch.equals(rb.arch)));
- result = result && ((rb.crcLogo == null && crcLogo == null) || (crcLogo != null && crcLogo.equals(rb.crcLogo)));
- result = result && ((rb.customerCode == null && customerCode == null) || (customerCode != null && customerCode.equals(rb.customerCode)));
- result = result && ((rb.osName == null && osName == null) || (osName != null && osName.equals(rb.osName)));
- result = result && ((rb.macAddresses == null && macAddresses == null) || (macAddresses != null && macAddresses.equals(rb.macAddresses)));
- return result;
- }
+ public String getPackCode() {
+ return packCode;
+ }
+
+ public void setPackCode(String packCode) {
+ this.packCode = packCode;
+ }
+
+ public String getLicenseTypeCode() {
+ return licenseTypeCode;
+ }
+
+ public void setLicenseTypeCode(String licenseTypeCode) {
+ this.licenseTypeCode = licenseTypeCode;
+ }
}
--
Gitblit v1.3.2