rsanchez
2015-08-10 775ff84a141370c01006367f5f95de285f64aa11
#0 fix - Minor changes on method params names
3 files modified
changed files
src/main/java/net/curisit/securis/LicenseManager.java patch | view | blame | history
src/main/java/net/curisit/securis/LicenseValidator.java patch | view | blame | history
src/main/java/net/curisit/securis/beans/RequestBean.java patch | view | blame | history
src/main/java/net/curisit/securis/LicenseManager.java
....@@ -30,7 +30,7 @@
3030 */
3131 public class LicenseManager {
3232
33
- private static final Logger LOG = LogManager.getLogger(License.class);
33
+ private static final Logger LOG = LogManager.getLogger(LicenseManager.class);
3434
3535 private static LicenseManager singleton = new LicenseManager();
3636
src/main/java/net/curisit/securis/LicenseValidator.java
....@@ -58,8 +58,8 @@
5858 }
5959 }
6060
61
- public void validateHW(RequestBean reqBean, String appCode, String customerCode, String packCode) throws SeCurisException {
62
- RequestBean currentHW = ReqGenerator.getInstance().createRequest(appCode, customerCode, packCode);
61
+ public void validateHW(RequestBean reqBean, String licTypeCode, String customerCode, String packCode) throws SeCurisException {
62
+ RequestBean currentHW = ReqGenerator.getInstance().createRequest(licTypeCode, customerCode, packCode);
6363 if (!currentHW.match(reqBean)) {
6464 throw new SeCurisException("Current System info mismatch the License System info:\n Licensed: \n" + JsonUtils.toPrettyJSON(reqBean)
6565 + "\n Expected: \n" + JsonUtils.toPrettyJSON(currentHW));
src/main/java/net/curisit/securis/beans/RequestBean.java
....@@ -3,6 +3,9 @@
33 import java.util.Collections;
44 import java.util.List;
55
6
+import net.curisit.securis.SeCurisException;
7
+import net.curisit.securis.utils.JsonUtils;
8
+
69 import com.fasterxml.jackson.annotation.JsonAutoDetect;
710 import com.fasterxml.jackson.annotation.JsonInclude;
811 import com.fasterxml.jackson.annotation.JsonInclude.Include;
....@@ -132,4 +135,14 @@
132135 public void setLicenseTypeCode(String licenseTypeCode) {
133136 this.licenseTypeCode = licenseTypeCode;
134137 }
138
+
139
+ public static void main(String[] args) {
140
+ String requestData = "{\n \"licenseTypeCode\": \"CI01\",\n \"packCode\": \"CIBP01\",\n \"arch\": \"amd64\",\n \"osName\": \"Windows Server 2012\",\n \"customerCode\": \"BP01\",\n \"macAddresses\": [\n \"02-71-1A-0E-5D-7C\"\n ],\n \"crcLogo\": \"153e09683eaa26d23c951f6605af5f874b533a917f73681e3e0a1f175aae3981\"\n}";
141
+ try {
142
+ JsonUtils.json2object(requestData, RequestBean.class);
143
+ } catch (SeCurisException e) {
144
+ // TODO Auto-generated catch block
145
+ e.printStackTrace();
146
+ }
147
+ }
135148 }