From 775ff84a141370c01006367f5f95de285f64aa11 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 10 Aug 2015 07:51:36 +0000
Subject: [PATCH] #0 fix - Minor changes on method params names
---
src/main/java/net/curisit/securis/LicenseValidator.java | 4 ++--
src/main/java/net/curisit/securis/LicenseManager.java | 2 +-
src/main/java/net/curisit/securis/beans/RequestBean.java | 13 +++++++++++++
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/curisit/securis/LicenseManager.java b/src/main/java/net/curisit/securis/LicenseManager.java
index 9f6a397..5cd0c22 100644
--- a/src/main/java/net/curisit/securis/LicenseManager.java
+++ b/src/main/java/net/curisit/securis/LicenseManager.java
@@ -30,7 +30,7 @@
*/
public class LicenseManager {
- private static final Logger LOG = LogManager.getLogger(License.class);
+ private static final Logger LOG = LogManager.getLogger(LicenseManager.class);
private static LicenseManager singleton = new LicenseManager();
diff --git a/src/main/java/net/curisit/securis/LicenseValidator.java b/src/main/java/net/curisit/securis/LicenseValidator.java
index 3022aea..c5d7e93 100644
--- a/src/main/java/net/curisit/securis/LicenseValidator.java
+++ b/src/main/java/net/curisit/securis/LicenseValidator.java
@@ -58,8 +58,8 @@
}
}
- public void validateHW(RequestBean reqBean, String appCode, String customerCode, String packCode) throws SeCurisException {
- RequestBean currentHW = ReqGenerator.getInstance().createRequest(appCode, customerCode, packCode);
+ public void validateHW(RequestBean reqBean, String licTypeCode, String customerCode, String packCode) throws SeCurisException {
+ RequestBean currentHW = ReqGenerator.getInstance().createRequest(licTypeCode, customerCode, packCode);
if (!currentHW.match(reqBean)) {
throw new SeCurisException("Current System info mismatch the License System info:\n Licensed: \n" + JsonUtils.toPrettyJSON(reqBean)
+ "\n Expected: \n" + JsonUtils.toPrettyJSON(currentHW));
diff --git a/src/main/java/net/curisit/securis/beans/RequestBean.java b/src/main/java/net/curisit/securis/beans/RequestBean.java
index 8925903..f97ee40 100644
--- a/src/main/java/net/curisit/securis/beans/RequestBean.java
+++ b/src/main/java/net/curisit/securis/beans/RequestBean.java
@@ -3,6 +3,9 @@
import java.util.Collections;
import java.util.List;
+import net.curisit.securis.SeCurisException;
+import net.curisit.securis.utils.JsonUtils;
+
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -132,4 +135,14 @@
public void setLicenseTypeCode(String licenseTypeCode) {
this.licenseTypeCode = licenseTypeCode;
}
+
+ public static void main(String[] args) {
+ 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}";
+ try {
+ JsonUtils.json2object(requestData, RequestBean.class);
+ } catch (SeCurisException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.3.2