Skip to content

Commit 819c965

Browse files
committed
refactor: linter plus issue fixed
1 parent 9657eeb commit 819c965

2 files changed

Lines changed: 6 additions & 33 deletions

File tree

src/main/java/io/apimatic/core/utilities/CoreHelper.java

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
import io.apimatic.core.types.http.request.MultipartFileWrapper;
7272
import io.apimatic.core.types.http.request.MultipartWrapper;
7373
import io.apimatic.coreinterfaces.http.request.ArraySerializationFormat;
74-
import io.apimatic.coreinterfaces.http.request.Request;
7574
import io.apimatic.coreinterfaces.http.response.Response;
7675

7776
/**
@@ -1630,33 +1629,6 @@ public static String resolveResponsePointer(String pointer, Response response) {
16301629
}
16311630
}
16321631

1633-
/**
1634-
* Resolves a pointer within a JSON request body or headers.
1635-
*
1636-
* @param pointer The JSON pointer.
1637-
* @param request The request.
1638-
* @return The resolved value as a string, or null if not found.
1639-
*/
1640-
public static String resolveRequestPointer(String pointer, Request request) {
1641-
if (pointer == null) {
1642-
return null;
1643-
}
1644-
1645-
String[] pointerParts = pointer.split("#");
1646-
String prefix = pointerParts[0];
1647-
String point = pointerParts.length > 1 ? pointerParts[1] : "";
1648-
1649-
switch (prefix) {
1650-
case "$request.body":
1651-
return CoreHelper.getValueFromJson(point, request.getBody().toString());
1652-
case "$request.headers":
1653-
return CoreHelper.getValueFromJson(point,
1654-
trySerialize(request.getHeaders().asSimpleMap()));
1655-
default:
1656-
return null;
1657-
}
1658-
}
1659-
16601632
/**
16611633
* Retrieves a value from a JSON string using a JSON pointer.
16621634
*

src/test/java/apimatic/core/security/HmacSignatureVerifierTest.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,8 @@ public void verifyAsyncSuccessRequestSignatureTemplateResolverBody() throws Exce
429429
}
430430
String cookie = request.getHeaders().asSimpleMap().get("Cookie");
431431
String timestamp = request.getHeaders().asSimpleMap().get("X-Timestamp");
432-
String resolvedBody = CoreHelper.resolveRequestPointer("$request.body#/type", request);
432+
String resolvedBody = CoreHelper.getValueFromJson(
433+
"/type", request.getBody().toString());
433434

434435
return String.join(
435436
":",
@@ -472,8 +473,7 @@ public void verifyAsyncSuccessRequestSignatureTemplateResolverHeaders() throws E
472473
}
473474
String cookie = request.getHeaders().asSimpleMap().get("Cookie");
474475
String timestamp = request.getHeaders().asSimpleMap().get("X-Timestamp");
475-
String resolvedBody = CoreHelper.resolveRequestPointer(
476-
"$request.headers#/x-signature", request);
476+
String resolvedBody = request.getHeaders().asSimpleMap().get("x-signature");
477477

478478
return String.join(
479479
":",
@@ -498,15 +498,16 @@ public void verifyAsyncSuccessRequestSignatureTemplateResolverHeaders() throws E
498498
public void resolveRequestPointerNullPointer() {
499499
Map<String, String> headers = new HashMap<>();
500500
Request request = mockRequest(headers, BODY);
501-
String value = CoreHelper.resolveRequestPointer(null, request);
501+
String value = CoreHelper.getValueFromJson(null, request.getBody().toString());
502502
assertNull(value);
503503
}
504504

505505
@Test
506506
public void resolveRequestPointerInvalidPointer() {
507507
Map<String, String> headers = new HashMap<>();
508508
Request request = mockRequest(headers, BODY);
509-
String value = CoreHelper.resolveRequestPointer("$request.method#", request);
509+
String value = CoreHelper.getValueFromJson(
510+
"$request.method#", request.getBody().toString());
510511
assertNull(value);
511512
}
512513
}

0 commit comments

Comments
 (0)