clean up

Author: soh boon keong

CHANGELOG.md

@@ -3,9 +3,9 @@
 ### V1.3.5-SNAPSHOT
 
 - Fixed vulnerability CVE-2020-25649, CVE-2020-15522, CVE-2020-9488 and CVE-2019-17571
-- Updated bouncycastle to v1.69
-- Updated jackson-databind to v2.10.5.1
-- Removed slf4j, updated to log4j v2.14.1 for logging
+- Update dependency library for bouncycastle to version 1.69
+- Update dependency library for jackson-databind to version 2.10.5.1
+- Remove dependency library for slf4j, updated to log4j version 2.14.1 for logging
 
 ### V1.3.4-SNAPSHOT
 

README.md

@@ -63,22 +63,25 @@ mvn install
 <dependency>
     <groupId>com.api.util</groupId>
     <artifactId>ApiSecurity</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.5-SNAPSHOT</version>
 </dependency>
 ```
 
 **Note:** 
-* This project is leveraging on _slf4j-log4j12_ framework for the logging. If you are using logging implementation other than log4j, you can change to other type of implementation such as nop,simple,jdk14,logback. You could replace the following xml in pom.xml.
-* If your are using Log4j _Version2_, please refer to [Log4j2-SLF4J Binding](https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/index.html)
+* This project is leveraging on Log4j _Version2_  framework for the logging. If you are using logging implementation other than Log4j _Version2_ , you can change to other type of implementation such as nop,simple,jdk14,logback. You could replace the following xml in pom.xml.
 
 
 ```xml
 <dependency>
-    <groupId>org.slf4j</groupId>
-    <artifactId>slf4j-log4j12</artifactId>
-    <version>1.7.25</version>
+	<groupId>org.apache.logging.log4j</groupId>
+	<artifactId>log4j-api</artifactId>
+	<version>2.14.1</version>
+</dependency>
+<dependency>
+	<groupId>org.apache.logging.log4j</groupId>
+	<artifactId>log4j-core</artifactId>
+	<version>2.14.1</version>
 </dependency>
-  	
 ```
 
 #### Maven Test
@@ -566,6 +569,6 @@ See [CHANGELOG.md](CHANGELOG.md).
 
 ## References
 + [UTF-8 in Gradle](https://stackoverflow.com/questions/21267234/show-utf-8-text-properly-in-gradle)
-+ [SLF4J FAQ](https://www.slf4j.org/faq.html)
++ [LOG4J2 FAQ](https://logging.apache.org/log4j/2.x/faq.html)
 + [Akana API Consumer Security](http://docs.akana.com/ag/cm_policies/using_api_consumer_app_sec_policy.htm)
 + [RSA and HMAC Request Signing Standard](http://tools.ietf.org/html/draft-cavage-http-signatures-05)

build.gradle

@@ -19,25 +19,19 @@ dependencies {
 
     //gradle 4.0
     compile group: 'commons-lang', name: 'commons-lang', version: '2.4'
-    //compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
     compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.14.1'
     compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.14.1'
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.5.1'
     compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
     compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.69'
 
-    //testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.32'
-    testCompile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.14.1'
-    testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.14.1'
     testCompile group: 'junit', name: 'junit', version: '4.13.1'
 
     //gradle 6.9
     //implementation group: 'commons-lang', name: 'commons-lang', version: '2.4'
-    //implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
     //implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.5.1'
     //implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
     //implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.69'
-    //testImplementation group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.32'
     //testImplementation group: 'junit', name: 'junit', version: '4.13.1'
 }
 

pom.xml

@@ -77,12 +77,7 @@
 		<version>1.3</version>
 		<scope>test</scope>
 	</dependency> 	
-  <!-- 	<dependency>
-  		<groupId>org.slf4j</groupId>
-  		<artifactId>slf4j-log4j12</artifactId>
-  		<version>1.7.32</version>
-  	</dependency>  -->
-  	  	<dependency>
+  	<dependency>
 		    <groupId>org.apache.logging.log4j</groupId>
 		    <artifactId>log4j-api</artifactId>
 		    <version>2.14.1</version>

src/test/java/com/api/util/ApiSecurity/ApiSecurityTest.java

@@ -16,8 +16,6 @@
 import java.util.Set;
 
 import org.junit.runner.RunWith;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
@@ -37,7 +35,6 @@
 @RunWith(JUnitFactoryRunner.class)
 public class ApiSecurityTest {
 
-	//private static final Logger log = LoggerFactory.getLogger(ApiSecurityTest.class);
 	private static final Logger log = LogManager.getLogger(ApiSecurityTest.class);
 
 	private static final String testDataPath = getLocalPath("src/main/resources/test-suites/testData/");

src/test/java/com/api/util/testframework/RuntimeTestCase.java

@@ -1,7 +1,5 @@
 package com.api.util.testframework;
 
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
@@ -52,6 +50,7 @@ public void setTestName(String testName) {
     */
     @JUnitFactoryTest
     public void getSignatureBaseString() throws IOException, InterruptedException, ParseException {
+    	  log.trace("Entering teset test application.");
     	log.info("====================> Start :: RuntimeTestCase :: getSignatureBaseString :: testName : {} ", testName);
 
 		ExpectedResult expectedResult = testDatum.getExpectedResult();

src/test/java/com/api/util/testframework/RuntimeTestUtility.java

@@ -1,7 +1,5 @@
 package com.api.util.testframework;
 
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;