Fix quality issues and Log

(cherry picked from commit 77fab66)

Author: sgrampone

gamutils/pom.xml

@@ -15,13 +15,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>gxcommon</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
@@ -37,6 +31,16 @@
             <artifactId>bcpkix-jdk18on</artifactId>
             <version>${org.bouncycastle.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+        </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>

gamutils/src/main/java/com/genexus/gam/utils/CertificateUtil.java

@@ -1,7 +1,7 @@
 package com.genexus.gam.utils;
 
-import com.genexus.diagnostics.core.ILogger;
-import com.genexus.diagnostics.core.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.apache.commons.io.FilenameUtils;
 import org.bouncycastle.cert.X509CertificateHolder;
 import org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory;
@@ -15,7 +15,7 @@ public enum CertificateUtil {
 
 	crt, cer, pfx, jks, pkcs12, p12, pem, key;
 
-	public static final ILogger logger = LogManager.getLogger(CertificateUtil.class);
+	private static Logger logger = LogManager.getLogger(CertificateUtil.class);
 
 	public static CertificateUtil value(String ext) {
 		switch (ext.toLowerCase().trim()) {
@@ -90,7 +90,7 @@ private static X509Certificate loadFromPkcs12(String path, String alias, String
 		try (FileInputStream inStream = new FileInputStream(path)) {
 			KeyStore ks = KeyStore.getInstance("PKCS12");
 			ks.load(inStream, password.toCharArray());
-			if (alias.equals("") || alias.isEmpty()) {
+			if (alias.isEmpty()) {
 				return (X509Certificate) ks.getCertificate(ks.aliases().nextElement());
 			} else {
 				return (X509Certificate) ks.getCertificate(alias);

gamutils/src/main/java/com/genexus/gam/utils/Hash.java

@@ -1,15 +1,15 @@
 package com.genexus.gam.utils;
 
-import com.genexus.diagnostics.core.ILogger;
-import com.genexus.diagnostics.core.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.digests.SHA512Digest;
 import org.bouncycastle.util.encoders.Base64;
 
 import java.nio.charset.StandardCharsets;
 
 public class Hash {
-	public static final ILogger logger = LogManager.getLogger(Hash.class);
+	private static Logger logger = LogManager.getLogger(Hash.class);
 
 	public static String sha512(String plainText) {
 		if (plainText.isEmpty()) {

gamutils/src/main/java/com/genexus/gam/utils/Jwk.java

@@ -1,18 +1,18 @@
 package com.genexus.gam.utils;
 
-import com.genexus.diagnostics.core.ILogger;
-import com.genexus.diagnostics.core.LogManager;
 import com.nimbusds.jose.Algorithm;
 import com.nimbusds.jose.jwk.JWK;
 import com.nimbusds.jose.jwk.KeyUse;
 import com.nimbusds.jose.jwk.RSAKey;
 import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.UUID;
 
 public class Jwk {
 
-	public static final ILogger logger = LogManager.getLogger(Jwk.class);
+	private static Logger logger = LogManager.getLogger(Jwk.class);
 
 	public static String generateKeyPair() {
 		try {

gamutils/src/main/java/com/genexus/gam/utils/Jwks.java

@@ -1,13 +1,13 @@
 package com.genexus.gam.utils;
 
-import com.genexus.diagnostics.core.ILogger;
-import com.genexus.diagnostics.core.LogManager;
 import com.nimbusds.jose.jwk.JWK;
 import com.nimbusds.jose.jwk.JWKSet;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class Jwks {
 
-	public static final ILogger logger = LogManager.getLogger(Jwks.class);
+	private static Logger logger = LogManager.getLogger(Jwks.class);
 
 	public static boolean verifyJWT(String jwksString, String token, String kid) {
 		if (jwksString.isEmpty()) {

gamutils/src/main/java/com/genexus/gam/utils/Jwt.java

@@ -1,21 +1,20 @@
 package com.genexus.gam.utils;
 
-import com.genexus.diagnostics.core.ILogger;
-import com.genexus.diagnostics.core.LogManager;
 import com.nimbusds.jose.JWSHeader;
 import com.nimbusds.jose.JWSVerifier;
 import com.nimbusds.jose.crypto.RSASSASigner;
 import com.nimbusds.jose.crypto.RSASSAVerifier;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
-import org.apache.commons.io.FilenameUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
 
 public class Jwt {
 
-	public static final ILogger logger = LogManager.getLogger(Jwt.class);
+	private static Logger logger = LogManager.getLogger(Jwt.class);
 
 	/******** EXTERNAL OBJECT PUBLIC METHODS - BEGIN ********/
 
@@ -48,8 +47,4 @@ public static boolean verify(String path, String alias, String password, String
 	/******** EXTERNAL OBJECT PUBLIC METHODS - END ********/
 
 
-	private static boolean extensionIs(String stringPath, String extension) {
-		return extension.equalsIgnoreCase(FilenameUtils.getExtension(stringPath));
-	}
-
 }

gamutils/src/main/java/com/genexus/gam/utils/Random.java

@@ -1,13 +1,13 @@
 package com.genexus.gam.utils;
 
-import com.genexus.diagnostics.core.ILogger;
-import com.genexus.diagnostics.core.LogManager;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.security.SecureRandom;
 
 public class Random {
 
-	public static final ILogger logger = LogManager.getLogger(Random.class);
+	private static Logger logger = LogManager.getLogger(Random.class);
 
 	private static SecureRandom instanceRandom() {
 		try {

gamutils/src/test/java/com/genexus/gam/utils/test/CertificateTest.java

@@ -9,14 +9,13 @@
 
 public class CertificateTest {
 
-	private static String resources;
 	private static String path_RSA_sha256_2048;
 	private static String alias;
 	private static String password;
 
 	@BeforeClass
 	public static void setUp() {
-		resources = System.getProperty("user.dir").concat("/src/test/resources");
+		String resources = System.getProperty("user.dir").concat("/src/test/resources");
 		path_RSA_sha256_2048 = resources.concat("/dummycerts/RSA_sha256_2048/");
 		alias = "1";
 		password = "dummy";

gamutils/src/test/java/com/genexus/gam/utils/test/JwtTest.java

@@ -21,7 +21,6 @@
 
 public class JwtTest {
 
-	private static String resources;
 	private static String header;
 	private static String payload;
 	private static String kid;
@@ -33,7 +32,7 @@ public class JwtTest {
 
 	@BeforeClass
 	public static void setUp() {
-		resources = System.getProperty("user.dir").concat("/src/test/resources");
+		String resources = System.getProperty("user.dir").concat("/src/test/resources");
 		kid = UUID.randomUUID().toString();
 		header = "{\n" +
 			"  \"alg\": \"RS256\",\n" +

gamutils/src/test/java/com/genexus/gam/utils/test/resources/CryptographicHash.java

@@ -11,7 +11,7 @@ public class CryptographicHash {
 
 	// private HashAlgorithm alg;
 	public CryptographicHash(String algorithm) {
-		if (algorithm == "" || algorithm == "SHA512")
+		if (algorithm.equals("SHA512"))
 			algorithm = "SHA-512";
 		// Supports algorithm = {MD2, MD5, SHA-1, SHA-256, SHA-384, SHA-512}
 		try {