Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/main/java/api_assured/ApiUtilities.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;

import static utils.StringUtilities.*;
import static utils.reflection.ReflectionUtilities.getPreviousMethodName;
import static utils.reflection.ReflectionUtilities.iterativeConditionalInvocation;
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/api_assured/Caller.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
import properties.PropertyUtilities;
import retrofit2.Call;
import retrofit2.Response;
import utils.*;
import utils.reflection.ReflectionUtilities;

import utils.Printer;
import utils.StringUtilities;
import utils.mapping.MappingUtilities;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Objects;

import static utils.MappingUtilities.Json.*;
import static utils.FileUtilities.Json.*;
import static utils.reflection.ReflectionUtilities.getPreviousMethodName;
import static utils.StringUtilities.Color.*;
import static utils.reflection.ReflectionUtilities.isOfType;
Expand Down Expand Up @@ -175,7 +175,7 @@ private static <T> Response<T> getResponse(Call<T> call, boolean printBody) thro
* @return A deserialized error object instance of type {@code Model}.
* @throws RuntimeException if there's an issue processing the error content or deserializing it.
*
* @see MappingUtilities.Json#fromJsonString(String, Class)
* @see utils.mapping.MappingUtilities.Json#fromJsonString(String, Class)
*/
@SuppressWarnings("unchecked")
private static <ErrorModel> ErrorModel getErrorObject(Response<?> response, Class<ErrorModel> errorModel) throws JsonProcessingException {
Expand All @@ -187,7 +187,7 @@ private static <ErrorModel> ErrorModel getErrorObject(Response<?> response, Clas
if (!StringUtilities.isBlank(bodyString)) {
if (errorModel.isAssignableFrom(String.class))
return (ErrorModel) bodyString;
else return fromJsonString(bodyString, errorModel);
else return MappingUtilities.Json.fromJsonString(bodyString, errorModel);
}
else
return null;
Expand Down Expand Up @@ -253,8 +253,8 @@ private static <ResponseModel> Response<ResponseModel> call(
* @return A deserialized error model instance of type {@code ErrorModel} if a match is found.
* @throws RuntimeException if none of the provided error models match the error content of the response.
*
* @see MappingUtilities.Json#fromJsonString(String, Class)
* @see MappingUtilities.Json#getJsonStringFor(Object)
* @see utils.mapping.MappingUtilities.Json#fromJsonString(String, Class)
* @see utils.mapping.MappingUtilities.Json#getJsonStringFor(Object)
* @see #getErrorObject(Response, Class)
*/
@SuppressWarnings("unchecked")
Expand Down
Loading