#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/RequestBean.java
..
..
@@ -8,107 +8,119 @@
8
8
 @JsonAutoDetect
9
9
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
10
10
 public class RequestBean {
11
-	private String customerCode;
12
-	private String crcLogo;
13
-	private String appCode;
14
-	private List<String> macAddresses;
15
-	private String osName;
16
-	private String arch;
11
+    private String customerCode;
12
+    private String crcLogo;
13
+    private String licenseTypeCode;
14
+    private String packCode;
15
+    private List<String> macAddresses;
16
+    private String osName;
17
+    private String arch;
17
18
 
18
-	public String getCustomerCode() {
19
-		return customerCode;
20
-	}
19
+    public String getCustomerCode() {
20
+        return customerCode;
21
+    }
21
22
 
22
-	public void setCustomerCode(String customerCode) {
23
-		this.customerCode = customerCode;
24
-	}
23
+    public void setCustomerCode(String customerCode) {
24
+        this.customerCode = customerCode;
25
+    }
25
26
 
26
-	public String getCrcLogo() {
27
-		return crcLogo;
28
-	}
27
+    public String getCrcLogo() {
28
+        return crcLogo;
29
+    }
29
30
 
30
-	public void setCrcLogo(String crcLogo) {
31
-		this.crcLogo = crcLogo;
32
-	}
31
+    public void setCrcLogo(String crcLogo) {
32
+        this.crcLogo = crcLogo;
33
+    }
33
34
 
34
-	public String getAppCode() {
35
-		return appCode;
36
-	}
35
+    public List<String> getMacAddresses() {
36
+        return macAddresses;
37
+    }
37
38
 
38
-	public void setAppCode(String appCode) {
39
-		this.appCode = appCode;
40
-	}
39
+    public void setMacAddresses(List<String> macAddresses) {
40
+        this.macAddresses = macAddresses;
41
+    }
41
42
 
42
-	public List<String> getMacAddresses() {
43
-		return macAddresses;
44
-	}
43
+    public String getOsName() {
44
+        return osName;
45
+    }
45
46
 
46
-	public void setMacAddresses(List<String> macAddresses) {
47
-		this.macAddresses = macAddresses;
48
-	}
47
+    public void setOsName(String osName) {
48
+        this.osName = osName;
49
+    }
49
50
 
50
-	public String getOsName() {
51
-		return osName;
52
-	}
51
+    public String getArch() {
52
+        return arch;
53
+    }
53
54
 
54
-	public void setOsName(String osName) {
55
-		this.osName = osName;
56
-	}
55
+    public void setArch(String arch) {
56
+        this.arch = arch;
57
+    }
57
58
 
58
-	public String getArch() {
59
-		return arch;
60
-	}
59
+    public boolean match(RequestBean rb) {
61
60
 
62
-	public void setArch(String arch) {
63
-		this.arch = arch;
64
-	}
61
+        boolean result = licenseTypeCode != null && licenseTypeCode.equals(rb.licenseTypeCode);
62
+        result = result && (packCode != null && packCode.equals(rb.packCode));
63
+        result = result && (arch != null && arch.equals(rb.arch));
64
+        // CRC Logo validation is optional, only if request file contains it
65
+        result = result && (crcLogo == null || crcLogo.equals(rb.crcLogo));
66
+        result = result && (customerCode != null && customerCode.equals(rb.customerCode));
67
+        result = result && (osName != null && osName.equals(rb.osName));
68
+        result = result && (macAddresses != null && rb.macAddresses != null) && anyMacIsIncluded(rb.getMacAddresses());
65
69
 
66
-	public boolean match(RequestBean rb) {
70
+        return result;
71
+    }
67
72
 
68
-		boolean result = appCode != null && appCode.equals(rb.appCode);
69
-		result = result && (arch != null && arch.equals(rb.arch));
70
-		// CRC Logo validation is optional, only if request file contains it
71
-		result = result && (crcLogo == null || crcLogo.equals(rb.crcLogo));
72
-		result = result && (customerCode != null && customerCode.equals(rb.customerCode));
73
-		result = result && (osName != null && osName.equals(rb.osName));
74
-		result = result && (macAddresses != null && rb.macAddresses != null) && anyMacIsIncluded(rb.getMacAddresses());
73
+    private boolean anyMacIsIncluded(List<String> macList) {
74
+        for (String mac : macList) {
75
+            if (macAddresses.contains(mac))
76
+                return true;
77
+        }
78
+        return false;
79
+    }
75
80
 
76
-		return result;
77
-	}
81
+    @Override
82
+    public int hashCode() {
83
+        int code = 0;
84
+        code += licenseTypeCode != null ? licenseTypeCode.hashCode() : 0;
85
+        code += arch != null ? arch.hashCode() : 0;
86
+        code += crcLogo != null ? crcLogo.hashCode() : 0;
87
+        code += packCode != null ? packCode.hashCode() : 0;
88
+        code += customerCode != null ? customerCode.hashCode() : 0;
89
+        code += osName != null ? osName.hashCode() : 0;
90
+        code += macAddresses != null ? macAddresses.hashCode() : 0;
78
91
 
79
-	private boolean anyMacIsIncluded(List<String> macList) {
80
-		for (String mac : macList) {
81
-			if (macAddresses.contains(mac))
82
-				return true;
83
-		}
84
-		return false;
85
-	}
92
+        return code;
93
+    };
86
94
 
95
+    @Override
96
+    public boolean equals(Object obj) {
97
+        if (!(obj instanceof RequestBean))
98
+            return false;
99
+        RequestBean rb = (RequestBean) obj;
100
+        boolean result = (rb.licenseTypeCode == null && licenseTypeCode == null)
101
+                || (licenseTypeCode != null && licenseTypeCode.equals(rb.licenseTypeCode));
102
+        result = result && ((rb.packCode == null && packCode == null) || (packCode != null && packCode.equals(rb.arch)));
103
+        result = result && ((rb.arch == null && arch == null) || (arch != null && arch.equals(rb.arch)));
104
+        result = result && ((rb.crcLogo == null && crcLogo == null) || (crcLogo != null && crcLogo.equals(rb.crcLogo)));
105
+        result = result && ((rb.customerCode == null && customerCode == null) || (customerCode != null && customerCode.equals(rb.customerCode)));
106
+        result = result && ((rb.osName == null && osName == null) || (osName != null && osName.equals(rb.osName)));
107
+        result = result && ((rb.macAddresses == null && macAddresses == null) || (macAddresses != null && macAddresses.equals(rb.macAddresses)));
108
+        return result;
109
+    }
87
110
 
88
-	@Override
89
-	public int hashCode() {
90
-		int code = 0;
91
-		code += appCode != null ? appCode.hashCode() : 0;
92
-		code += arch != null ? arch.hashCode() : 0;
93
-		code += crcLogo != null ? crcLogo.hashCode() : 0;
94
-		code += customerCode != null ? customerCode.hashCode() : 0;
95
-		code += osName != null ? osName.hashCode() : 0;
96
-		code += macAddresses != null ? macAddresses.hashCode() : 0;
97
-		
98
-		return code;
99
-	};
100
-	
101
-	@Override
102
-	public boolean equals(Object obj) {
103
-		if (!(obj instanceof RequestBean))
104
-			return false;
105
-		RequestBean rb = (RequestBean) obj;
106
-		boolean result = (rb.appCode == null && appCode == null) || (appCode != null && appCode.equals(rb.appCode));
107
-		result = result && ((rb.arch == null && arch == null) || (arch != null && arch.equals(rb.arch)));
108
-		result = result && ((rb.crcLogo == null && crcLogo == null) || (crcLogo != null && crcLogo.equals(rb.crcLogo)));
109
-		result = result && ((rb.customerCode == null && customerCode == null) || (customerCode != null && customerCode.equals(rb.customerCode)));
110
-		result = result && ((rb.osName == null && osName == null) || (osName != null && osName.equals(rb.osName)));
111
-		result = result && ((rb.macAddresses == null && macAddresses == null) || (macAddresses != null && macAddresses.equals(rb.macAddresses)));
112
-		return result;
113
-	}
111
+    public String getPackCode() {
112
+        return packCode;
113
+    }
114
+
115
+    public void setPackCode(String packCode) {
116
+        this.packCode = packCode;
117
+    }
118
+
119
+    public String getLicenseTypeCode() {
120
+        return licenseTypeCode;
121
+    }
122
+
123
+    public void setLicenseTypeCode(String licenseTypeCode) {
124
+        this.licenseTypeCode = licenseTypeCode;
125
+    }
114
126
 }