Merge branch 'poc-logging' of https://github.com/apimatic/core-lib-java…

… into poc-logging # Conflicts: # src/main/java/io/apimatic/core/logger/ConsoleLogger.java # src/main/java/io/apimatic/core/logger/SdkLogger.java # src/main/java/io/apimatic/core/logger/Slf4jLogger.java # src/test/java/apimatic/core/logger/SdkLoggerTest.java
apimatic · Apr 18, 2024 · 25e01b0 · 25e01b0
2 parents 9dbda8e + 0904b29
commit 25e01b0
Show file tree

Hide file tree

Showing 15 changed files with 675 additions and 674 deletions.
diff --git a/src/main/java/io/apimatic/core/ApiCall.java b/src/main/java/io/apimatic/core/ApiCall.java
@@ -40,12 +40,12 @@ public final class ApiCall<ResponseType, ExceptionType extends CoreApiException>
      * An instance of {@link CoreEndpointConfiguration}.
      */
     private final CoreEndpointConfiguration endpointConfiguration;
-    
+
     /**
      * An instance of {@link ApiLogger} for logging.
      */
     private final ApiLogger apiLogger;
-    
+
 
     /**
      * ApiCall constructor.
@@ -71,10 +71,10 @@ private ApiCall(final GlobalConfiguration globalConfig, final Request coreHttpRe
      * @throws ExceptionType Represents error response from the server.
      */
     public ResponseType execute() throws IOException, ExceptionType {
-    	apiLogger.logRequest(request);
-    	Response httpResponse = globalConfig.getHttpClient().execute(request, endpointConfiguration);
-		apiLogger.logResponse(httpResponse);
-    	
+        apiLogger.logRequest(request);
+        Response httpResponse = globalConfig.getHttpClient().execute(request, endpointConfiguration);
+        apiLogger.logResponse(httpResponse);
+
         return responseHandler.handle(request, httpResponse, globalConfig, endpointConfiguration);
     }
 

diff --git a/src/main/java/io/apimatic/core/GlobalConfiguration.java b/src/main/java/io/apimatic/core/GlobalConfiguration.java
@@ -64,7 +64,7 @@ public final class GlobalConfiguration {
      * A function to apply baseUri.
      */
     private Function<String, String> baseUri;
-    
+
     /***
      * An instance of {@link ReadonlyLoggingConfiguration}
      */
@@ -81,6 +81,7 @@ public final class GlobalConfiguration {
      * @param globalHeaders
      * @param additionalHeaders
      * @param baseUri
+     * @param loggingConfiguration
      */
     private GlobalConfiguration(final CompatibilityFactory compatibilityFactory,
             final String userAgent, final Map<String, String> userAgentConfig,
@@ -98,7 +99,7 @@ private GlobalConfiguration(final CompatibilityFactory compatibilityFactory,
         this.additionalHeaders = additionalHeaders;
         this.baseUri = baseUri;
         this.loggingConfiguration = loggingConfiguration;
-        
+
         if (this.userAgent != null) {
             this.userAgent = CoreHelper.updateUserAgent(userAgent, userAgentConfig);
             this.globalHeaders.put("user-agent", Arrays.asList(this.userAgent));
@@ -167,12 +168,12 @@ public HttpHeaders getAdditionalHeaders() {
     public Function<String, String> getBaseUri() {
         return baseUri;
     }
-    
+
     /***
      * @return Logging configuration for Logger
      */
     public ReadonlyLoggingConfiguration getLoggingConfiguration() {
-    	return loggingConfiguration;
+        return loggingConfiguration;
     }
 
     public static class Builder {
@@ -220,12 +221,12 @@ public static class Builder {
          * A function to retrieve baseUri.
          */
         private Function<String, String> baseUri;
-        
+
         /***
          * An instance of {@link ReadonlyLoggingConfiguration}
          */
         private ReadonlyLoggingConfiguration loggingConfiguration = new ApiLoggingConfiguration.Builder().build();
-        
+
         /**
          * @param compatibilityFactory value for CompatibilityFactor.
          * @return Builder.
@@ -314,14 +315,14 @@ public Builder baseUri(Function<String, String> baseUri) {
             this.baseUri = baseUri;
             return this;
         }
-        
+
         /**
          * @param config Logging configuration for Logger
          * @return Builder
          */
         public Builder loggingConfiguration(ReadonlyLoggingConfiguration config) {
-        	this.loggingConfiguration = config;
-        	return this;
+            this.loggingConfiguration = config;
+            return this;
         }
 
         /**

diff --git a/src/main/java/io/apimatic/core/HttpRequest.java b/src/main/java/io/apimatic/core/HttpRequest.java
@@ -151,15 +151,15 @@ private List<SimpleEntry<String, Object>> generateFormFields(
     }
 
     private StringBuilder getStringBuilder(String server, String path,
-    		Map<String, Object> queryParams,
-    		ArraySerializationFormat arraySerializationFormat) {
-    	
-    	StringBuilder urlBuilder = new StringBuilder(coreConfig.getBaseUri().apply(server) + path);
+            Map<String, Object> queryParams,
+            ArraySerializationFormat arraySerializationFormat) {
+
+        StringBuilder urlBuilder = new StringBuilder(coreConfig.getBaseUri().apply(server) + path);
 
         // set query parameters
         CoreHelper.appendUrlWithQueryParameters(urlBuilder, queryParams,
                 arraySerializationFormat);
-    	
+
         return new StringBuilder(CoreHelper.cleanUrl(urlBuilder));
     }