From e1743c557079051217d1e65901f4ae9f9dad7d00 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Thu, 18 Sep 2014 13:13:49 +0000
Subject: [PATCH] #0 feature - Fixed some SonarQube issues
---
src/main/java/net/curisit/securis/LicenseValidator.java | 4 ++--
src/main/java/net/curisit/securis/beans/LicenseBean.java | 10 ++++++++++
src/main/java/net/curisit/securis/utils/JsonUtils.java | 2 +-
src/main/java/net/curisit/securis/ReqGenerator.java | 9 +--------
src/main/java/net/curisit/securis/beans/RequestBean.java | 14 ++++++++++++++
pom.xml | 2 +-
6 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index ab9361c..c9eb743 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
<uniqueVersion>true</uniqueVersion>
<id>curistecSnapshot</id>
<name>CurisTec Snapshots</name>
- <url>http://92.54.10.233:48080/archiva/repository/snapshots/</url>
+ <url>http://10.0.0.12:8080/archiva/repository/snapshots/</url>
<layout>default</layout>
</snapshotRepository>
</distributionManagement>
diff --git a/src/main/java/net/curisit/securis/LicenseValidator.java b/src/main/java/net/curisit/securis/LicenseValidator.java
index 66744d6..a9fa2ad 100644
--- a/src/main/java/net/curisit/securis/LicenseValidator.java
+++ b/src/main/java/net/curisit/securis/LicenseValidator.java
@@ -17,13 +17,13 @@
private static final Logger log = LogManager.getLogger(LicenseValidator.class);
public static LicenseValidator singleton = new LicenseValidator();
- private byte[] LOGO_SECRET;
+ public static byte[] LOGO_SECRET;
private LicenseValidator() {
try {
LOGO_SECRET = "Logo ipsum s3cr3t test áíóú".getBytes("utf-8");
} catch (UnsupportedEncodingException e) {
- e.printStackTrace();
+ log.error("Unexpected error getting LOGO secret", e);
}
}
diff --git a/src/main/java/net/curisit/securis/ReqGenerator.java b/src/main/java/net/curisit/securis/ReqGenerator.java
index 15c86f8..f8d4a51 100644
--- a/src/main/java/net/curisit/securis/ReqGenerator.java
+++ b/src/main/java/net/curisit/securis/ReqGenerator.java
@@ -23,14 +23,7 @@
private static ReqGenerator singleton = new ReqGenerator();
- private byte[] LOGO_SECRET;
-
private ReqGenerator() {
- try {
- LOGO_SECRET = "Logo ipsum s3cr3t test áíóú".getBytes("utf-8");
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
}
public static ReqGenerator getInstance() {
@@ -91,7 +84,7 @@
if (is == null)
return null;
try {
- String shaLogo = LicUtils.sha256(IOUtils.toByteArray(is), LOGO_SECRET);
+ String shaLogo = LicUtils.sha256(IOUtils.toByteArray(is), LicenseValidator.LOGO_SECRET);
return shaLogo;
} catch (IOException e) {
log.error("Customer logo was not found in classpath in " + logResource, e);
diff --git a/src/main/java/net/curisit/securis/beans/LicenseBean.java b/src/main/java/net/curisit/securis/beans/LicenseBean.java
index 88e77d1..4fbdbcd 100644
--- a/src/main/java/net/curisit/securis/beans/LicenseBean.java
+++ b/src/main/java/net/curisit/securis/beans/LicenseBean.java
@@ -62,6 +62,16 @@
}
@Override
+ public int hashCode() {
+ int code = 0;
+ code += expirationDate != null ? expirationDate.hashCode() : 0;
+ code += signature != null ? signature.hashCode() : 0;
+ code += metadata != null ? metadata.hashCode() : 0;
+
+ return code;
+ };
+
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof LicenseBean))
return false;
diff --git a/src/main/java/net/curisit/securis/beans/RequestBean.java b/src/main/java/net/curisit/securis/beans/RequestBean.java
index 43544cc..79ae171 100644
--- a/src/main/java/net/curisit/securis/beans/RequestBean.java
+++ b/src/main/java/net/curisit/securis/beans/RequestBean.java
@@ -84,6 +84,20 @@
return false;
}
+
+ @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))
diff --git a/src/main/java/net/curisit/securis/utils/JsonUtils.java b/src/main/java/net/curisit/securis/utils/JsonUtils.java
index 15f6216..382178f 100644
--- a/src/main/java/net/curisit/securis/utils/JsonUtils.java
+++ b/src/main/java/net/curisit/securis/utils/JsonUtils.java
@@ -197,7 +197,7 @@
} catch (JsonParseException e) {
throw new SeCurisException("Error converting JSON to object", e);
} catch (IOException e) {
- e.printStackTrace();
+ log.error("Error converting JSON to object", e);
throw new SeCurisException("Error converting JSON to object", e);
}
}
--
Gitblit v1.3.2