diff --git a/src/main/java/com/github/brenoepics/at4j/AzureApi.java b/src/main/java/com/github/brenoepics/at4j/AzureApi.java index 2456d6f..1249037 100644 --- a/src/main/java/com/github/brenoepics/at4j/AzureApi.java +++ b/src/main/java/com/github/brenoepics/at4j/AzureApi.java @@ -1,17 +1,16 @@ package com.github.brenoepics.at4j; -import java.util.Collection; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; - import com.github.brenoepics.at4j.azure.BaseURL; -import com.github.brenoepics.at4j.data.DetectedLanguage; import com.github.brenoepics.at4j.azure.lang.Language; import com.github.brenoepics.at4j.core.thread.ThreadPool; +import com.github.brenoepics.at4j.data.DetectedLanguage; import com.github.brenoepics.at4j.data.request.AvailableLanguagesParams; import com.github.brenoepics.at4j.data.request.DetectLanguageParams; import com.github.brenoepics.at4j.data.request.TranslateParams; import com.github.brenoepics.at4j.data.response.TranslationResponse; +import java.util.Collection; +import java.util.Optional; +import java.util.concurrent.CompletableFuture; /** * This class is the most important class of AT4J, as it contains the main methods for translating diff --git a/src/main/java/com/github/brenoepics/at4j/core/AzureApiImpl.java b/src/main/java/com/github/brenoepics/at4j/core/AzureApiImpl.java index 40cd9bd..97d363d 100644 --- a/src/main/java/com/github/brenoepics/at4j/core/AzureApiImpl.java +++ b/src/main/java/com/github/brenoepics/at4j/core/AzureApiImpl.java @@ -3,20 +3,14 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; - import com.github.brenoepics.at4j.AzureApi; import com.github.brenoepics.at4j.azure.BaseURL; +import com.github.brenoepics.at4j.azure.lang.Language; import com.github.brenoepics.at4j.core.ratelimit.RateLimitManager; import com.github.brenoepics.at4j.core.thread.ThreadPool; +import com.github.brenoepics.at4j.core.thread.ThreadPoolImpl; import com.github.brenoepics.at4j.data.DetectedLanguage; import com.github.brenoepics.at4j.data.Translation; -import okhttp3.OkHttpClient; -import com.github.brenoepics.at4j.azure.lang.Language; -import com.github.brenoepics.at4j.core.thread.ThreadPoolImpl; import com.github.brenoepics.at4j.data.request.AvailableLanguagesParams; import com.github.brenoepics.at4j.data.request.DetectLanguageParams; import com.github.brenoepics.at4j.data.request.TranslateParams; @@ -24,6 +18,11 @@ import com.github.brenoepics.at4j.util.rest.RestEndpoint; import com.github.brenoepics.at4j.util.rest.RestMethod; import com.github.brenoepics.at4j.util.rest.RestRequest; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Optional; +import java.util.concurrent.CompletableFuture; +import okhttp3.OkHttpClient; public class AzureApiImpl implements AzureApi { diff --git a/src/main/java/com/github/brenoepics/at4j/core/exceptions/AzureException.java b/src/main/java/com/github/brenoepics/at4j/core/exceptions/AzureException.java index 4ce7f7e..2755868 100644 --- a/src/main/java/com/github/brenoepics/at4j/core/exceptions/AzureException.java +++ b/src/main/java/com/github/brenoepics/at4j/core/exceptions/AzureException.java @@ -1,10 +1,11 @@ package com.github.brenoepics.at4j.core.exceptions; -import java.util.Optional; - import com.github.brenoepics.at4j.util.rest.RestRequestInformation; import com.github.brenoepics.at4j.util.rest.RestRequestResponseInformation; +import java.util.Optional; + + /** This exception is always thrown whenever a request to azure failed. */ public class AzureException extends Exception { diff --git a/src/main/java/com/github/brenoepics/at4j/core/exceptions/BadRequestException.java b/src/main/java/com/github/brenoepics/at4j/core/exceptions/BadRequestException.java index 96ff4d6..7549405 100644 --- a/src/main/java/com/github/brenoepics/at4j/core/exceptions/BadRequestException.java +++ b/src/main/java/com/github/brenoepics/at4j/core/exceptions/BadRequestException.java @@ -1,7 +1,7 @@ package com.github.brenoepics.at4j.core.exceptions; -import com.github.brenoepics.at4j.util.rest.RestRequestResponseInformation; import com.github.brenoepics.at4j.util.rest.RestRequestInformation; +import com.github.brenoepics.at4j.util.rest.RestRequestResponseInformation; /** When we sent a bad request (HTTP response code 400). */ public class BadRequestException extends AzureException { diff --git a/src/main/java/com/github/brenoepics/at4j/core/exceptions/NotFoundException.java b/src/main/java/com/github/brenoepics/at4j/core/exceptions/NotFoundException.java index 3de9765..73292ed 100644 --- a/src/main/java/com/github/brenoepics/at4j/core/exceptions/NotFoundException.java +++ b/src/main/java/com/github/brenoepics/at4j/core/exceptions/NotFoundException.java @@ -1,7 +1,7 @@ package com.github.brenoepics.at4j.core.exceptions; -import com.github.brenoepics.at4j.util.rest.RestRequestResponseInformation; import com.github.brenoepics.at4j.util.rest.RestRequestInformation; +import com.github.brenoepics.at4j.util.rest.RestRequestResponseInformation; /** When something was not found (HTTP response code 404). */ public class NotFoundException extends BadRequestException { diff --git a/src/main/java/com/github/brenoepics/at4j/core/ratelimit/RateLimitManager.java b/src/main/java/com/github/brenoepics/at4j/core/ratelimit/RateLimitManager.java index 6bd7d6c..bd49fb5 100644 --- a/src/main/java/com/github/brenoepics/at4j/core/ratelimit/RateLimitManager.java +++ b/src/main/java/com/github/brenoepics/at4j/core/ratelimit/RateLimitManager.java @@ -1,19 +1,18 @@ package com.github.brenoepics.at4j.core.ratelimit; +import com.github.brenoepics.at4j.core.AzureApiImpl; +import com.github.brenoepics.at4j.core.exceptions.AzureException; +import com.github.brenoepics.at4j.util.logging.LoggerUtil; +import com.github.brenoepics.at4j.util.rest.RestRequest; +import com.github.brenoepics.at4j.util.rest.RestRequestResponseInformationImpl; +import com.github.brenoepics.at4j.util.rest.RestRequestResult; import java.util.HashSet; import java.util.Objects; import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.function.Function; - -import com.github.brenoepics.at4j.util.logging.LoggerUtil; import okhttp3.Response; import org.apache.logging.log4j.Logger; -import com.github.brenoepics.at4j.core.AzureApiImpl; -import com.github.brenoepics.at4j.core.exceptions.AzureException; -import com.github.brenoepics.at4j.util.rest.RestRequest; -import com.github.brenoepics.at4j.util.rest.RestRequestResponseInformationImpl; -import com.github.brenoepics.at4j.util.rest.RestRequestResult; /** This class manages rate-limits and keeps track of them. */ public class RateLimitManager { diff --git a/src/main/java/com/github/brenoepics/at4j/core/ratelimit/RatelimitBucket.java b/src/main/java/com/github/brenoepics/at4j/core/ratelimit/RatelimitBucket.java index 9e350a2..882a952 100644 --- a/src/main/java/com/github/brenoepics/at4j/core/ratelimit/RatelimitBucket.java +++ b/src/main/java/com/github/brenoepics/at4j/core/ratelimit/RatelimitBucket.java @@ -1,13 +1,12 @@ package com.github.brenoepics.at4j.core.ratelimit; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; - import com.github.brenoepics.at4j.AzureApi; import com.github.brenoepics.at4j.core.AzureApiImpl; import com.github.brenoepics.at4j.util.rest.RestEndpoint; import com.github.brenoepics.at4j.util.rest.RestRequest; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; public class RatelimitBucket { diff --git a/src/main/java/com/github/brenoepics/at4j/data/request/AvailableLanguagesParams.java b/src/main/java/com/github/brenoepics/at4j/data/request/AvailableLanguagesParams.java index cea9cb1..f6b89ca 100644 --- a/src/main/java/com/github/brenoepics/at4j/data/request/AvailableLanguagesParams.java +++ b/src/main/java/com/github/brenoepics/at4j/data/request/AvailableLanguagesParams.java @@ -1,10 +1,9 @@ package com.github.brenoepics.at4j.data.request; +import com.github.brenoepics.at4j.data.request.optional.LanguageScope; import java.util.Collections; import java.util.List; -import com.github.brenoepics.at4j.data.request.optional.LanguageScope; - public class AvailableLanguagesParams { private List scope = List.of(LanguageScope.TRANSLATION); private String sourceLanguage; diff --git a/src/main/java/com/github/brenoepics/at4j/data/request/TranslateParams.java b/src/main/java/com/github/brenoepics/at4j/data/request/TranslateParams.java index 3ae3b8b..8ca35c7 100644 --- a/src/main/java/com/github/brenoepics/at4j/data/request/TranslateParams.java +++ b/src/main/java/com/github/brenoepics/at4j/data/request/TranslateParams.java @@ -4,13 +4,12 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -import java.util.*; -import java.util.stream.Collectors; - import com.github.brenoepics.at4j.azure.lang.Language; import com.github.brenoepics.at4j.data.request.optional.ProfanityAction; import com.github.brenoepics.at4j.data.request.optional.ProfanityMarker; import com.github.brenoepics.at4j.data.request.optional.TextType; +import java.util.*; +import java.util.stream.Collectors; public class TranslateParams { private String text; diff --git a/src/main/java/com/github/brenoepics/at4j/data/response/TranslationResponse.java b/src/main/java/com/github/brenoepics/at4j/data/response/TranslationResponse.java index 4dba85d..7391d16 100644 --- a/src/main/java/com/github/brenoepics/at4j/data/response/TranslationResponse.java +++ b/src/main/java/com/github/brenoepics/at4j/data/response/TranslationResponse.java @@ -1,10 +1,9 @@ package com.github.brenoepics.at4j.data.response; -import java.util.Collection; -import javax.annotation.Nullable; - import com.github.brenoepics.at4j.data.DetectedLanguage; import com.github.brenoepics.at4j.data.Translation; +import java.util.Collection; +import javax.annotation.Nullable; public class TranslationResponse { diff --git a/src/main/java/com/github/brenoepics/at4j/util/rest/RestEndpoint.java b/src/main/java/com/github/brenoepics/at4j/util/rest/RestEndpoint.java index b738c55..dfa0f2b 100644 --- a/src/main/java/com/github/brenoepics/at4j/util/rest/RestEndpoint.java +++ b/src/main/java/com/github/brenoepics/at4j/util/rest/RestEndpoint.java @@ -1,8 +1,7 @@ package com.github.brenoepics.at4j.util.rest; -import java.util.Optional; - import com.github.brenoepics.at4j.azure.BaseURL; +import java.util.Optional; import okhttp3.HttpUrl; /** This enum contains all endpoints that we may use. */ diff --git a/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestHttpResponseCode.java b/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestHttpResponseCode.java index 343ff20..2d2243f 100644 --- a/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestHttpResponseCode.java +++ b/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestHttpResponseCode.java @@ -1,5 +1,9 @@ package com.github.brenoepics.at4j.util.rest; +import com.github.brenoepics.at4j.core.exceptions.AzureException; +import com.github.brenoepics.at4j.core.exceptions.AzureExceptionInstantiator; +import com.github.brenoepics.at4j.core.exceptions.BadRequestException; +import com.github.brenoepics.at4j.core.exceptions.NotFoundException; import java.util.Arrays; import java.util.Collections; import java.util.Map; @@ -7,11 +11,6 @@ import java.util.function.Function; import java.util.stream.Collectors; -import com.github.brenoepics.at4j.core.exceptions.AzureException; -import com.github.brenoepics.at4j.core.exceptions.BadRequestException; -import com.github.brenoepics.at4j.core.exceptions.NotFoundException; -import com.github.brenoepics.at4j.core.exceptions.AzureExceptionInstantiator; - /** * An enum with all rest request result codes as defined by Azure. diff --git a/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResponseInformation.java b/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResponseInformation.java index 08d2241..703f314 100644 --- a/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResponseInformation.java +++ b/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResponseInformation.java @@ -1,8 +1,7 @@ package com.github.brenoepics.at4j.util.rest; -import java.util.Optional; - import com.github.brenoepics.at4j.AzureApi; +import java.util.Optional; /** Some information about a rest request response. */ public interface RestRequestResponseInformation { diff --git a/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResponseInformationImpl.java b/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResponseInformationImpl.java index 3fe1130..bb21b36 100644 --- a/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResponseInformationImpl.java +++ b/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResponseInformationImpl.java @@ -1,8 +1,7 @@ package com.github.brenoepics.at4j.util.rest; -import java.util.Optional; - import com.github.brenoepics.at4j.AzureApi; +import java.util.Optional; /** The implementation of {@link RestRequestResponseInformation}. */ public class RestRequestResponseInformationImpl implements RestRequestResponseInformation { diff --git a/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResult.java b/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResult.java index ab171f8..38e6c41 100644 --- a/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResult.java +++ b/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResult.java @@ -4,10 +4,9 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.NullNode; +import com.github.brenoepics.at4j.util.logging.LoggerUtil; import java.io.IOException; import java.util.Optional; - -import com.github.brenoepics.at4j.util.logging.LoggerUtil; import okhttp3.Response; import okhttp3.ResponseBody; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResultErrorCode.java b/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResultErrorCode.java index bf01431..3d862f3 100644 --- a/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResultErrorCode.java +++ b/src/main/java/com/github/brenoepics/at4j/util/rest/RestRequestResultErrorCode.java @@ -1,5 +1,6 @@ package com.github.brenoepics.at4j.util.rest; +import com.github.brenoepics.at4j.core.exceptions.*; import java.util.Arrays; import java.util.Collections; import java.util.Map; diff --git a/src/test/java/com/github/brenoepics/at4j/AzureApiTest.java b/src/test/java/com/github/brenoepics/at4j/AzureApiTest.java index 9afade5..e61e44d 100644 --- a/src/test/java/com/github/brenoepics/at4j/AzureApiTest.java +++ b/src/test/java/com/github/brenoepics/at4j/AzureApiTest.java @@ -2,18 +2,17 @@ import static org.junit.Assert.*; +import com.github.brenoepics.at4j.azure.BaseURL; +import com.github.brenoepics.at4j.azure.lang.Language; +import com.github.brenoepics.at4j.data.request.AvailableLanguagesParams; +import com.github.brenoepics.at4j.data.request.TranslateParams; +import com.github.brenoepics.at4j.data.response.TranslationResponse; import java.util.Collection; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; - -import com.github.brenoepics.at4j.azure.BaseURL; import okhttp3.OkHttpClient; import org.junit.Test; -import com.github.brenoepics.at4j.azure.lang.Language; -import com.github.brenoepics.at4j.data.request.AvailableLanguagesParams; -import com.github.brenoepics.at4j.data.request.TranslateParams; -import com.github.brenoepics.at4j.data.response.TranslationResponse; public class AzureApiTest {