chore: Tidyup build issues

.gitignore

@@ -0,0 +1,103 @@
+# General
+*.log
+*.keystore
+.history/
+*.tgz
+
+# git-secret rules
+.secrets/*.*
+!.secrets/*.secret
+!.secrets/public-keys/
+.gitsecret/keys/random_seed
+.gitsecret/keys/pubring.kbx~
+
+
+.ci/gradle*
+
+# You can put a script which call `yarn prettier-eslint --write` that prettify the file in-place.
+# Keep in mind the hook files are executed by alphabet sequence: so `in_place_prettier_eslint` will be executed before `prettier_eslint`
+buildtools/hooks/pre-commit.d/in_place_prettier_eslint
+
+# Archives / Binaries
+*.jar
+*.zip
+*.tar.gz
+*.so
+*.xcarchive
+
+# MacOS
+.DS_Store
+
+# Build Output
+build/
+out/
+bin/
+codemr/
+
+# JetBrains
+.idea/
+*.iml
+*.ipr
+*.iws
+.mvn/
+.project
+
+# VSCode
+.vscode/
+*.code-workspace
+
+# Eclipse
+.settings/
+.classpath
+
+# Java
+*.hprof
+.gradle/
+!gradle-wrapper.jar
+!gradle-wrapper.properties
+
+
+# Node or NPM or Yarn
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+node_modules/
+.eslintcache
+
+# Jest/Bamboo test results output
+jest.json
+coverage/
+
+# Vagrant
+.vagrant/
+
+# Xcode
+#
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+project.xcworkspace
+**/*.framework/
+
+
+# VIM
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+version.yml
+
+#Andorid
+local.properties

pom.xml

@@ -7,7 +7,7 @@
 	<version>0.0.1.SNAPSPOT</version>
 	<name>firetail-java-lib</name>
 	<description>Java Library for Firetail</description>
-	<url>https://github.com/muhammadn/firetail-java-lib<url>
+	<url>https://github.com/muhammadn/firetail-java-lib</url>
 
 	<developers>
 		<developer>
@@ -30,7 +30,7 @@
 		<commons-io.version>2.6</commons-io.version>
 		<javax-servlet.version>4.0.1</javax-servlet.version>
 		<logstash-logback.version>5.3</logstash-logback.version>
-		<spring.version>5.2.3.RELEASE</spring.version>
+		<spring.version>5.2.21.RELEASE</spring.version>
 		<spring.boot.version>2.1.4.RELEASE</spring.boot.version>
 		<slf4j.version>1.7.26</slf4j.version>
 	</properties>

src/main/java/io/firetail/logging/config/SpringLoggerAutoConfiguration.java

@@ -1,24 +1,18 @@
 package io.firetail.logging.config;
 
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.core.net.ssl.KeyStoreFactoryBean;
-import ch.qos.logback.core.net.ssl.SSLConfiguration;
 //import net.logstash.logback.appender.LogstashTcpSocketAppender;
 //import net.logstash.logback.encoder.LogstashEncoder;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.ConfigurationProperties;
+		import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.web.client.RestTemplate;
 
 import io.firetail.logging.client.RestTemplateSetHeaderInterceptor;
-import io.firetail.logging.filter.SpringLoggingFilter;
+import io.firetail.logging.filter.SpringLoggerFilter;
 import io.firetail.logging.util.UniqueIDGenerator;
 
 import javax.annotation.PostConstruct;
@@ -28,9 +22,9 @@
 
 @Configuration
 @ConfigurationProperties(prefix = "logging.logstash")
-public class SpringLoggingAutoConfiguration {
+public class SpringLoggerAutoConfiguration {
 
-	private static final String FIRETAIL_APPENDER_NAME = "FIRETAIL";
+	// private static final String FIRETAIL_APPENDER_NAME = "FIRETAIL";
 
 	private String url = "localhost:8500";
 	private String ignorePatterns;
@@ -48,15 +42,15 @@ public UniqueIDGenerator generator() {
 	}
 
 	@Bean
-	public SpringLoggingFilter loggingFilter() {
-		return new SpringLoggingFilter(generator(), ignorePatterns, logHeaders);
+	public SpringLoggerFilter loggingFilter() {
+		return new SpringLoggerFilter(generator(), ignorePatterns, logHeaders);
 	}
 
 	@Bean
 	@ConditionalOnMissingBean(RestTemplate.class)
 	public RestTemplate restTemplate() {
 		RestTemplate restTemplate = new RestTemplate();
-		List<ClientHttpRequestInterceptor> interceptorList = new ArrayList<ClientHttpRequestInterceptor>();
+		List<ClientHttpRequestInterceptor> interceptorList = new ArrayList<>();
 		interceptorList.add(new RestTemplateSetHeaderInterceptor());
 		restTemplate.setInterceptors(interceptorList);
 		return restTemplate;
@@ -94,11 +88,11 @@ public FiretailTcpSocketAppender firetailAppender() {
 	@PostConstruct
 	public void init() {
 		template.ifPresent(restTemplate -> {
-			List<ClientHttpRequestInterceptor> interceptorList = new ArrayList<ClientHttpRequestInterceptor>();
+			List<ClientHttpRequestInterceptor> interceptorList = new ArrayList<>();
 			interceptorList.add(new RestTemplateSetHeaderInterceptor());
 			restTemplate.setInterceptors(interceptorList);
 		});
-	} 
+	}
 
 	public String getUrl() {
 		return url;

src/main/java/io/firetail/logging/filter/SpringLoggerFilter.java

@@ -1,5 +1,8 @@
 package io.firetail.logging.filter;
 
+import io.firetail.logging.util.UniqueIDGenerator;
+import io.firetail.logging.wrapper.SpringRequestWrapper;
+import io.firetail.logging.wrapper.SpringResponseWrapper;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,31 +12,28 @@
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerExecutionChain;
-import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
-import io.firetail.logging.util.UniqueIDGenerator;
-import io.firetail.logging.wrapper.SpringRequestWrapper;
-import io.firetail.logging.wrapper.SpringResponseWrapper;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Map;
 import java.util.Objects;
 
-public class SpringLoggingFilter extends OncePerRequestFilter {
+import static net.logstash.logback.argument.StructuredArguments.value;
+
+public class SpringLoggerFilter extends OncePerRequestFilter {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SpringLoggingFilter.class);
-    private UniqueIDGenerator generator;
-    private String ignorePatterns;
-    private boolean logHeaders;
+    private static final Logger LOGGER = LoggerFactory.getLogger(SpringLoggerFilter.class);
+    private final UniqueIDGenerator generator;
+    private final String ignorePatterns;
+    private final boolean logHeaders;
 
     @Autowired
     ApplicationContext context;
 
-    public SpringLoggingFilter(UniqueIDGenerator generator, String ignorePatterns, boolean logHeaders) {
+    public SpringLoggerFilter(UniqueIDGenerator generator, String ignorePatterns, boolean logHeaders) {
         this.generator = generator;
         this.ignorePatterns = ignorePatterns;
         this.logHeaders = logHeaders;
@@ -88,7 +88,7 @@ private void logResponse(long startTime, SpringResponseWrapper wrappedResponse,
 
     private void getHandlerMethod(HttpServletRequest request) throws Exception {
         RequestMappingHandlerMapping mappings1 = (RequestMappingHandlerMapping) context.getBean("requestMappingHandlerMapping");
-        Map<RequestMappingInfo, HandlerMethod> handlerMethods = mappings1.getHandlerMethods();
+        // Map<RequestMappingInfo, HandlerMethod> handlerMethods = mappings1.getHandlerMethods();
         HandlerExecutionChain handler = mappings1.getHandler(request);
         if (Objects.nonNull(handler)) {
             HandlerMethod handler1 = (HandlerMethod) handler.getHandler();