From 52ce72b22ef8d92a1f35b4993bcddaaa66d67350 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Thu, 18 Sep 2014 17:55:35 +0000
Subject: [PATCH] #396 fix - Fixed some SonarQube issues
---
securis/src/patch/java/net/curisit/securis/LicenseGenerator.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/securis/src/patch/java/net/curisit/securis/LicenseGenerator.java b/securis/src/patch/java/net/curisit/securis/LicenseGenerator.java
index d57a8ca..a9d3414 100644
--- a/securis/src/patch/java/net/curisit/securis/LicenseGenerator.java
+++ b/securis/src/patch/java/net/curisit/securis/LicenseGenerator.java
@@ -33,7 +33,7 @@
*/
public class LicenseGenerator {
- private static final Logger log = LogManager.getLogger(LicenseGenerator.class);
+ private static final Logger LOG = LogManager.getLogger(LicenseGenerator.class);
private static LicenseGenerator singleton = new LicenseGenerator();
@@ -58,7 +58,7 @@
* @throws SeCurisException
*/
public LicenseBean generateLicense(RequestBean req, Map<String, Object> metadata, Date expirationDate, String licenseType, String licenseCode) throws SeCurisException {
- log.info(MessageFormat.format("Generating license: MAC: {0}, Customer code: {1}, AppCode: {2}", req.getMacAddresses(), req.getCustomerCode(), req.getAppCode()));
+ LOG.info(MessageFormat.format("Generating license: MAC: {0}, Customer code: {1}, AppCode: {2}", req.getMacAddresses(), req.getCustomerCode(), req.getAppCode()));
LicenseBean license = new LicenseBean(req);
license.setLicenseType(licenseType);
license.setLicenseCode(licenseCode);
@@ -83,14 +83,14 @@
json = JsonUtils.toJSON(signedLic, true).getBytes("utf-8");
Files.write(Paths.get(file.toURI()), json, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
} catch (UnsupportedEncodingException e) {
- log.error("Error creating json doc from license: " + license, e);
+ LOG.error("Error creating json doc from license: " + license, e);
throw new SeCurisException("Error creating json doc from license: " + license, e);
} catch (IOException e) {
- log.error("Error creating license file: " + file, e);
+ LOG.error("Error creating license file: " + file, e);
throw new SeCurisException("Error creating json doc from license: " + license, e);
}
- log.info("License saved in {}", file);
+ LOG.info("License saved in {}", file);
}
@@ -119,15 +119,15 @@
licBean.setSignature(Base64.encodeBase64String(signatureData));
return licBean.getSignature();
} catch (NoSuchAlgorithmException e) {
- log.error("Error signing license for " + licBean, e);
+ LOG.error("Error signing license for " + licBean, e);
} catch (InvalidKeyException e) {
- log.error("Error signing license for " + licBean, e);
+ LOG.error("Error signing license for " + licBean, e);
} catch (InvalidKeySpecException e) {
- log.error("Error signing license for " + licBean, e);
+ LOG.error("Error signing license for " + licBean, e);
} catch (IOException e) {
- log.error("Error signing license for " + licBean, e);
+ LOG.error("Error signing license for " + licBean, e);
} catch (SignatureException e) {
- log.error("Error signing license for " + licBean, e);
+ LOG.error("Error signing license for " + licBean, e);
}
throw new SeCurisException("License could not be generated");
}
@@ -136,11 +136,18 @@
RequestBean req = ReqGenerator.getInstance().loadRequest(new File("/Users/cproberto/Documents/wsCurisIT/SeCurisClient/license.req"));
Map<String, Object> metadata = new TreeMap<>();
- metadata.put("maxUsers", 20);
- metadata.put("maxSessionUsers", 2);
+// CurisData parameters:
+// metadata.put("maxUsers", 5);
+// metadata.put("maxSessionUsers", 100);
+ // curisIntegrity
+ metadata.put("maxUsers", 0);
+ metadata.put("maxInstances", 0);
+ metadata.put("timeThreshold", 0);
+ metadata.put("datasetPrefix", "BP");
+ metadata.put("extendedMode", true);
Date expirationDate = new Date(new Date().getTime() + (1000L * 3600 * 24 * 365 * 10));
- LicenseBean lic = LicenseGenerator.getInstance().generateLicense(req, metadata, expirationDate, "CD-01", "LIC-CURISTEC-0001");
- LicenseGenerator.getInstance().save(lic, new File("/Users/cproberto/Desktop/YanFei.lic"));
+ LicenseBean lic = LicenseGenerator.getInstance().generateLicense(req, metadata, expirationDate, "CI-01", "LIC-CURISTEC-0001");
+ LicenseGenerator.getInstance().save(lic, new File("/Users/cproberto/Desktop/AxelLicCI.lic"));
System.out.print("License expires at: " + expirationDate.getTime());
--
Gitblit v1.3.2