Moved from Slf4j to System.Logger and removed guava dependency

README.md

@@ -365,15 +365,14 @@ the terms and conditions of this license.
 This project has some third-party dependencies, each of which may have independent licensing:
 
 - [Jackson Databind:2.17.1](https://github.com/FasterXML/jackson) ([The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt))
-- [Guava:33.2.1-jre](https://github.com/google/guava/) ([The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt))
 - [Reactor Netty HTTP:1.1.19](https://github.com/reactor/reactor-netty) ([The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt))
 - [Reactor Core:3.6.6](https://github.com/reactor/reactor-core) ([The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt))
 - [Jakarta Validation API:3.1.0](https://www.eclipse.org) ([The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt))
 - [Apache BVal JSR:3.0.0](https://bval.apache.org/) ([The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt))
 - [Apache Tika Core:2.9.2](https://tika.apache.org/) ([The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt))
 - [MapStruct:1.5.5.Final](https://mapstruct.org/mapstruct/) ([The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt))
-- [SLF4J API:2.0.13](http://www.slf4j.org) ([MIT License](http://www.opensource.org/licenses/mit-license.php))
-- [SLF4J Simple:2.0.13](http://www.slf4j.org) ([MIT License](http://www.opensource.org/licenses/mit-license.php))
+- [jsr305:3.0.2](https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305/3.0.2) ([GNU Lesser General Public License, Version 2.1](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html))
+- [checker-qual:3.46.0](https://checkerframework.org/) ([MIT License](https://opensource.org/licenses/MIT))
 
 # How to contribute?
 

build.gradle.kts

@@ -34,11 +34,12 @@ dependencies {
 
     implementation("com.fasterxml.jackson.core:jackson-databind:2.17.1")
 
-    implementation("org.slf4j:slf4j-api:2.0.13")
-    runtimeOnly("org.slf4j:slf4j-simple:2.0.13")
     implementation("org.apache.tika:tika-core:2.9.2")
-    implementation("com.google.guava:guava:33.2.1-jre")
     implementation("org.mapstruct:mapstruct:1.5.5.Final")
+    implementation("com.google.code.findbugs:jsr305:3.0.2")
+    implementation("org.checkerframework:checker-qual:3.46.0")
+
+
 
     compileOnly("org.projectlombok:lombok:1.18.32")
     annotationProcessor("org.projectlombok:lombok:1.18.32")

src/main/java/com/picsart/creativeapis/AbstractApiClient.java

@@ -24,11 +24,10 @@
 
 package com.picsart.creativeapis;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.picsart.creativeapis.busobj.ApiConfig;
 import com.picsart.creativeapis.busobj.HttpResponseWithStringBody;
 import com.picsart.creativeapis.http.ApiHttpClient;
-import jakarta.validation.constraints.NotNull;
+import com.picsart.creativeapis.utils.UrlUtils;
 import java.time.Duration;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
@@ -40,20 +39,11 @@
 public abstract class AbstractApiClient {
   ApiHttpClient apiHttpClient;
 
-  @NotNull
-  private static String removeTailingSlashIfAny(String baseUrl) {
-    return baseUrl.endsWith("/") ? baseUrl.substring(0, baseUrl.length() - 1) : baseUrl;
-  }
-
-  @VisibleForTesting
-  public static String appendBaseUrl(String baseUrl, String url) {
-    return "%s/%s".formatted(removeTailingSlashIfAny(baseUrl), url);
-  }
-
   protected Mono<HttpResponseWithStringBody> getAsyncResponse(
       ApiConfig config, String url, int repeatCount, Duration delay) {
     return apiHttpClient
-        .sendGetRequest(appendBaseUrl(config.baseUrl(), url), config.apiKey(), config.timeout())
+        .sendGetRequest(
+            UrlUtils.appendBaseUrl(config.baseUrl(), url), config.apiKey(), config.timeout())
         .filter(
             httpResponseWithParsedBody -> {
               var code = httpResponseWithParsedBody.getHttpClientResponse().status().code();

src/main/java/com/picsart/creativeapis/busobj/image/parameters/UpscaleParameters.java

@@ -45,7 +45,7 @@ public class UpscaleParameters {
   /** The source of the image to be upscaled. */
   ImageSource image;
 
-  /** The upscale factor for the upscaling. This is optional. Allowed values: 2, 4, 8, 16. */
+  /** The upscale factor for the upscaling. This is optional. Allowed values: 2, 4, 6, 8. */
   @Nullable Integer upscaleFactor;
 
   /** The desired format of the image after upscaling. This is optional. */

src/main/java/com/picsart/creativeapis/genai/client/GenAIApiClientImpl.java

@@ -36,12 +36,11 @@
 import com.picsart.creativeapis.busobj.genai.response.Text2ImageMiddleResponse;
 import com.picsart.creativeapis.busobj.genai.response.Text2ImageResponse;
 import com.picsart.creativeapis.http.ApiHttpClient;
+import com.picsart.creativeapis.utils.UrlUtils;
 import lombok.NonNull;
 import lombok.experimental.FieldDefaults;
-import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
 
-@Slf4j
 @FieldDefaults(makeFinal = true, level = lombok.AccessLevel.PRIVATE)
 public class GenAIApiClientImpl extends AbstractApiClient implements GenAIApiClient {
   GenAIApiClientConfig clientConfig;
@@ -55,14 +54,13 @@ public GenAIApiClientImpl(
   @Override
   public Mono<HttpResponseWithBody<Text2ImageResponse>> text2Image(
       ApiConfig config, Text2ImageRequest request) {
-    log.debug("Text2Image request: {}", request);
     var apiKey = config.apiKey();
     var baseUrl = config.baseUrl();
     var validateRequestMono = validateRequestMono(request, ApiActions.TEXT2IMAGE.actionName());
     var sendRequestMono =
         apiHttpClient
             .sendPostRequest(
-                appendBaseUrl(baseUrl, ApiActions.TEXT2IMAGE.url()),
+                UrlUtils.appendBaseUrl(baseUrl, ApiActions.TEXT2IMAGE.url()),
                 apiKey,
                 request,
                 config.timeout())
@@ -79,7 +77,7 @@ private Mono<HttpResponseWithBody<Text2ImageResponse>> getText2ImageAsyncResult(
       ApiConfig config, String id) {
     return apiHttpClient
         .sendGetRequest(
-            appendBaseUrl(
+            UrlUtils.appendBaseUrl(
                 config.baseUrl(),
                 ApiActions.TEXT2IMAGE.url() + SLASH + INFERENCES_URL.formatted(id)),
             config.apiKey(),

src/main/java/com/picsart/creativeapis/http/ApiHttpClientImpl.java

@@ -31,18 +31,20 @@
 import com.picsart.creativeapis.utils.Constants;
 import com.picsart.creativeapis.utils.ExceptionUtils;
 import com.picsart.creativeapis.utils.JacksonUtils;
-import io.netty.handler.codec.http.*;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpStatusClass;
 import java.time.Duration;
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
-import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
 import reactor.netty.ByteBufFlux;
 import reactor.netty.http.client.HttpClient;
 
-@Slf4j
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
 public class ApiHttpClientImpl implements ApiHttpClient {
+  private final System.Logger log = System.getLogger(ApiHttpClientImpl.class.getName());
   HttpClient client;
 
   public ApiHttpClientImpl() {
@@ -107,7 +109,8 @@ private Mono<HttpResponseWithStringBody> handleResponse(
                       .asString()
                       .doOnNext(
                           body ->
-                              log.debug(
+                              log.log(
+                                  System.Logger.Level.DEBUG,
                                   """
                                             Response received for {} request to '{}'
                                             RequestBody: {}
@@ -132,8 +135,13 @@ private Mono<HttpResponseWithStringBody> handleResponse(
         .onErrorMap(
             e -> !(e instanceof ApiException),
             e -> {
-              log.error(
-                  "Error sending {} request to '{}'\nRequestBody: {}", method, url, request, e);
+              log.log(
+                  System.Logger.Level.ERROR,
+                  "Error sending {} request to '{}'\nRequestBody: {}",
+                  method,
+                  url,
+                  request,
+                  e);
               return new ApiException("Error sending request", e);
             });
   }

src/main/java/com/picsart/creativeapis/image/client/ImageApiClientImpl.java

@@ -37,13 +37,12 @@
 import com.picsart.creativeapis.busobj.image.response.*;
 import com.picsart.creativeapis.busobj.mapper.MetadataMapper;
 import com.picsart.creativeapis.http.ApiHttpClient;
+import com.picsart.creativeapis.utils.UrlUtils;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import lombok.NonNull;
 import lombok.experimental.FieldDefaults;
-import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
 
-@Slf4j
 @FieldDefaults(makeFinal = true, level = lombok.AccessLevel.PRIVATE)
 public class ImageApiClientImpl extends AbstractApiClient implements ImageApiClient {
   ImageApiClientConfig clientConfig;
@@ -64,7 +63,7 @@ public Mono<HttpResponseWithBody<RemoveBackgroundResponse>> removeBackground(
     var sendRequestMono =
         apiHttpClient
             .sendPostRequest(
-                appendBaseUrl(baseUrl, ApiActions.REMOVE_BACKGROUND.url()),
+                UrlUtils.appendBaseUrl(baseUrl, ApiActions.REMOVE_BACKGROUND.url()),
                 apiKey,
                 request,
                 config.timeout())
@@ -81,7 +80,10 @@ public Mono<HttpResponseWithBody<EffectResponse>> effect(
     var sendRequestMono =
         apiHttpClient
             .sendPostRequest(
-                appendBaseUrl(baseUrl, ApiActions.EFFECT.url()), apiKey, request, config.timeout())
+                UrlUtils.appendBaseUrl(baseUrl, ApiActions.EFFECT.url()),
+                apiKey,
+                request,
+                config.timeout())
             .map(response -> response.parseBody(EffectResponse.class));
     return validateRequestMono.then(sendRequestMono);
   }
@@ -92,7 +94,9 @@ public Mono<HttpResponseWithBody<ListEffectsResponse>> listEffects(ApiConfig con
     var baseUrl = config.baseUrl();
     return apiHttpClient
         .sendGetRequest(
-            appendBaseUrl(baseUrl, ApiActions.LIST_EFFECTS.url()), apiKey, config.timeout())
+            UrlUtils.appendBaseUrl(baseUrl, ApiActions.LIST_EFFECTS.url()),
+            apiKey,
+            config.timeout())
         .map(response -> response.parseBody(ListEffectsResponse.class));
   }
 
@@ -105,7 +109,7 @@ public Mono<HttpResponseWithBody<UltraUpscaleResponse>> ultraUpscale(
     var sendRequestMono =
         apiHttpClient
             .sendPostRequest(
-                appendBaseUrl(baseUrl, ApiActions.ULTRA_UPSCALE.url()),
+                UrlUtils.appendBaseUrl(baseUrl, ApiActions.ULTRA_UPSCALE.url()),
                 apiKey,
                 request,
                 config.timeout())
@@ -140,7 +144,10 @@ public Mono<HttpResponseWithBody<UpscaleResponse>> upscale(
     var sendRequestMono =
         apiHttpClient
             .sendPostRequest(
-                appendBaseUrl(baseUrl, ApiActions.UPSCALE.url()), apiKey, request, config.timeout())
+                UrlUtils.appendBaseUrl(baseUrl, ApiActions.UPSCALE.url()),
+                apiKey,
+                request,
+                config.timeout())
             .map(response -> response.parseBody(UpscaleResponse.class));
     return validateRequestMono.then(sendRequestMono);
   }
@@ -154,7 +161,7 @@ public Mono<HttpResponseWithBody<UltraEnhanceResponse>> ultraEnhance(
     var sendRequestMono =
         apiHttpClient
             .sendPostRequest(
-                appendBaseUrl(baseUrl, ApiActions.ULTRA_ENHANCE.url()),
+                UrlUtils.appendBaseUrl(baseUrl, ApiActions.ULTRA_ENHANCE.url()),
                 apiKey,
                 request,
                 config.timeout())
@@ -171,7 +178,7 @@ public Mono<HttpResponseWithBody<EnhanceFaceResponse>> enhanceFace(
     var sendRequestMono =
         apiHttpClient
             .sendPostRequest(
-                appendBaseUrl(baseUrl, ApiActions.ENHANCE_FACE.url()),
+                UrlUtils.appendBaseUrl(baseUrl, ApiActions.ENHANCE_FACE.url()),
                 apiKey,
                 request,
                 config.timeout())
@@ -189,7 +196,7 @@ public Mono<HttpResponseWithBody<EffectsPreviewsResponse>> effectsPreviews(
     var sendRequestMono =
         apiHttpClient
             .sendPostRequest(
-                appendBaseUrl(baseUrl, ApiActions.EFFECTS_PREVIEWS.url()),
+                UrlUtils.appendBaseUrl(baseUrl, ApiActions.EFFECTS_PREVIEWS.url()),
                 apiKey,
                 request,
                 config.timeout())
@@ -206,7 +213,10 @@ public Mono<HttpResponseWithBody<AdjustResponse>> adjust(
     var sendRequestMono =
         apiHttpClient
             .sendPostRequest(
-                appendBaseUrl(baseUrl, ApiActions.ADJUST.url()), apiKey, request, config.timeout())
+                UrlUtils.appendBaseUrl(baseUrl, ApiActions.ADJUST.url()),
+                apiKey,
+                request,
+                config.timeout())
             .map(response -> response.parseBody(AdjustResponse.class));
     return validateRequestMono.then(sendRequestMono);
   }
@@ -221,7 +231,7 @@ public Mono<HttpResponseWithBody<BackgroundTextureResponse>> backgroundTexture(
     var sendRequestMono =
         apiHttpClient
             .sendPostRequest(
-                appendBaseUrl(baseUrl, ApiActions.BACKGROUND_TEXTURE.url()),
+                UrlUtils.appendBaseUrl(baseUrl, ApiActions.BACKGROUND_TEXTURE.url()),
                 apiKey,
                 request,
                 config.timeout())
@@ -238,7 +248,7 @@ public Mono<HttpResponseWithBody<SurfaceMapResponse>> surfaceMap(
     var sendRequestMono =
         apiHttpClient
             .sendPostRequest(
-                appendBaseUrl(baseUrl, ApiActions.SURFACE_MAP.url()),
+                UrlUtils.appendBaseUrl(baseUrl, ApiActions.SURFACE_MAP.url()),
                 apiKey,
                 request,
                 config.timeout())
@@ -255,7 +265,10 @@ public Mono<HttpResponseWithBody<UploadResponse>> upload(
     var sendRequestMono =
         apiHttpClient
             .sendPostRequest(
-                appendBaseUrl(baseUrl, ApiActions.UPLOAD.url()), apiKey, request, config.timeout())
+                UrlUtils.appendBaseUrl(baseUrl, ApiActions.UPLOAD.url()),
+                apiKey,
+                request,
+                config.timeout())
             .map(response -> response.parseBody(UploadResponse.class));
     return validateRequestMono.then(sendRequestMono);
   }
@@ -265,7 +278,8 @@ public Mono<HttpResponseWithBody<BalanceResponse>> balance(ApiConfig config) {
     var apiKey = config.apiKey();
     var baseUrl = config.baseUrl();
     return apiHttpClient
-        .sendGetRequest(appendBaseUrl(baseUrl, ApiActions.BALANCE.url()), apiKey, config.timeout())
+        .sendGetRequest(
+            UrlUtils.appendBaseUrl(baseUrl, ApiActions.BALANCE.url()), apiKey, config.timeout())
         .map(response -> response.parseBody(BalanceResponse.class));
   }
 

src/main/java/com/picsart/creativeapis/utils/ExceptionUtils.java

@@ -24,7 +24,6 @@
 
 package com.picsart.creativeapis.utils;
 
-import com.google.common.collect.ImmutableMap;
 import com.picsart.creativeapis.busobj.exception.*;
 import com.picsart.creativeapis.busobj.mapper.MetadataMapper;
 import com.picsart.creativeapis.busobj.result.Metadata;
@@ -40,26 +39,26 @@ public class ExceptionUtils {
       HTTP_RESPONSE_TO_EXCEPTION_MAP;
 
   static {
-    var builder =
-        ImmutableMap
-            .<HttpResponseStatus, BiFunction<String, Metadata, FailureResponseException>>builder();
-    builder.put(HttpResponseStatus.BAD_REQUEST, BadRequestException::new);
-    builder.put(HttpResponseStatus.UNAUTHORIZED, UnauthorizedException::new);
-    builder.put(HttpResponseStatus.FORBIDDEN, ForbiddenException::new);
-    builder.put(HttpResponseStatus.NOT_FOUND, NotFoundException::new);
-    builder.put(HttpResponseStatus.METHOD_NOT_ALLOWED, MethodNotAllowedException::new);
-    builder.put(HttpResponseStatus.REQUEST_TIMEOUT, RequestTimeoutException::new);
-    builder.put(HttpResponseStatus.REQUEST_ENTITY_TOO_LARGE, RequestEntityTooLargeException::new);
-    builder.put(HttpResponseStatus.UNSUPPORTED_MEDIA_TYPE, UnsupportedMediaTypeException::new);
-    builder.put(HttpResponseStatus.TOO_MANY_REQUESTS, TooManyRequestsException::new);
-    builder.put(
-        HttpResponseStatus.REQUEST_HEADER_FIELDS_TOO_LARGE,
-        RequestHeaderFieldsTooLargeException::new);
-    builder.put(HttpResponseStatus.INTERNAL_SERVER_ERROR, InternalServerErrorException::new);
-    builder.put(HttpResponseStatus.BAD_GATEWAY, BadGatewayException::new);
-    builder.put(HttpResponseStatus.SERVICE_UNAVAILABLE, ServiceUnavailableException::new);
-    builder.put(HttpResponseStatus.GATEWAY_TIMEOUT, GatewayTimeoutException::new);
-    HTTP_RESPONSE_TO_EXCEPTION_MAP = builder.build();
+    HTTP_RESPONSE_TO_EXCEPTION_MAP =
+        Map.ofEntries(
+            Map.entry(HttpResponseStatus.BAD_REQUEST, BadRequestException::new),
+            Map.entry(HttpResponseStatus.UNAUTHORIZED, UnauthorizedException::new),
+            Map.entry(HttpResponseStatus.FORBIDDEN, ForbiddenException::new),
+            Map.entry(HttpResponseStatus.NOT_FOUND, NotFoundException::new),
+            Map.entry(HttpResponseStatus.METHOD_NOT_ALLOWED, MethodNotAllowedException::new),
+            Map.entry(HttpResponseStatus.REQUEST_TIMEOUT, RequestTimeoutException::new),
+            Map.entry(
+                HttpResponseStatus.REQUEST_ENTITY_TOO_LARGE, RequestEntityTooLargeException::new),
+            Map.entry(
+                HttpResponseStatus.UNSUPPORTED_MEDIA_TYPE, UnsupportedMediaTypeException::new),
+            Map.entry(HttpResponseStatus.TOO_MANY_REQUESTS, TooManyRequestsException::new),
+            Map.entry(
+                HttpResponseStatus.REQUEST_HEADER_FIELDS_TOO_LARGE,
+                RequestHeaderFieldsTooLargeException::new),
+            Map.entry(HttpResponseStatus.INTERNAL_SERVER_ERROR, InternalServerErrorException::new),
+            Map.entry(HttpResponseStatus.BAD_GATEWAY, BadGatewayException::new),
+            Map.entry(HttpResponseStatus.SERVICE_UNAVAILABLE, ServiceUnavailableException::new),
+            Map.entry(HttpResponseStatus.GATEWAY_TIMEOUT, GatewayTimeoutException::new));
   }
 
   public FailureResponseException mapToFailureResponseException(

src/main/java/com/picsart/creativeapis/utils/MultipartRequestBodyUtils.java

@@ -24,11 +24,10 @@
 
 package com.picsart.creativeapis.utils;
 
-import com.google.common.base.CaseFormat;
-import com.google.common.base.Function;
 import java.beans.Introspector;
 import java.io.File;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import lombok.SneakyThrows;
@@ -145,7 +144,7 @@ private Map<String, Object> introspect(Object obj) {
   }
 
   private String camelToSnake(String camelCase) {
-    return CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, camelCase);
+    return camelCase.replaceAll("([a-z])([A-Z]+)", "$1_$2").toLowerCase(Locale.ROOT);
   }
 
   private String getMimeType(File file) {