✨ Implemented new method getRequestBuilder(path).

Author: rmcdouga

rest-services/jersey-client/src/main/java/com/_4point/aem/docservices/rest_services/client/jersey/JerseyRestClient.java

@@ -14,6 +14,7 @@
 import org.glassfish.jersey.media.multipart.MultiPartFeature;
 
 import com._4point.aem.docservices.rest_services.client.RestClient;
+import com._4point.aem.docservices.rest_services.client.RestClient.GetRequest.Builder;
 import com._4point.aem.docservices.rest_services.client.helpers.AemConfig;
 
 import jakarta.ws.rs.client.Client;
@@ -41,11 +42,10 @@ public class JerseyRestClient implements RestClient {
 	 * @param client Jersey Client object
 	 */
 	public JerseyRestClient(AemConfig aemConfig, String target, Supplier<String> correlationIdFn, Client client) {
-		this.target = configureClient(client,aemConfig.user(), aemConfig.password())
+		this(configureClient(client,aemConfig.user(), aemConfig.password())
 						.target(aemConfig.url())
-						.path(target)
-						;
-		this.correlationIdFn = correlationIdFn;
+						.path(target),
+			 correlationIdFn);
 	}
 
 	/**
@@ -58,6 +58,11 @@ public JerseyRestClient(AemConfig aemConfig, String target, Supplier<String> cor
 		this(aemConfig, target, correlationIdFn, getClient());
 	}
 
+	private JerseyRestClient(WebTarget target, Supplier<String> correlationIdFn) {
+		this.target = target;
+		this.correlationIdFn = correlationIdFn;
+	}
+
 	private static Client configureClient(Client client, String username, String password) {
 		return client.register(MultiPartFeature.class)
 					 .register(HttpAuthenticationFeature.basic(username, password));
@@ -225,7 +230,7 @@ public MultipartPayload build() {
 	 * Singleton Client-related code
 	 * 
 	 */
-	// Safe way to lazily initialize singeleton.  See https://en.wikipedia.org/wiki/Initialization-on-demand_holder_idiom 
+	// Safe way to lazily initialize singleton.  See https://en.wikipedia.org/wiki/Initialization-on-demand_holder_idiom 
 	private static class ClientHolder {
 		static final Client INSTANCE = ClientBuilder.newClient();
 	}
@@ -249,6 +254,13 @@ public String target() {
 	public GetRequest.Builder getRequestBuilder() {
 		return new JerseyGetRequestBuilder();
 	}
+
+	@Override
+	public Builder getRequestBuilder(String additionalPath) {
+		WebTarget updatedPath = target.path(additionalPath.startsWith("/") ? additionalPath : "/" + additionalPath);
+		// Create a GetRequestBuilder for an updated JerseyRestClient path
+		return new JerseyRestClient(updatedPath, correlationIdFn).new JerseyGetRequestBuilder();
+	}
 
 	private final class JerseyGetRequestBuilder extends PayloadBuilder implements GetRequest.Builder {
 

rest-services/jersey-client/src/test/java/com/_4point/aem/docservices/rest_services/client/jersey/JerseyRestClientTest.java

@@ -13,6 +13,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
 import com._4point.aem.docservices.rest_services.client.RestClient;
 import com._4point.aem.docservices.rest_services.client.RestClient.ContentType;
 import com._4point.aem.docservices.rest_services.client.RestClient.GetRequest;
@@ -451,6 +454,25 @@ void testGetFromServer_DocumentResponseWithHeader() throws Exception {
 				);
 	}
 
+	@DisplayName("GetFromServer with additional path parameter")
+	@ParameterizedTest
+	@ValueSource(strings = {"foo", "/foo"})
+	void testGetFromServer_AdditionalPath(String additionalPath) throws Exception {
+		// Given
+		String expectedEndpoint = ENDPOINT + "/foo";
+		stubFor(get(urlPathEqualTo(expectedEndpoint))
+				    .willReturn(okForContentType(ContentType.TEXT_HTML.contentType(), MOCK_PDF_BYTES)));
+		
+		// When
+		Response response = underTest.getRequestBuilder(additionalPath).build().getFromServer(ContentType.TEXT_HTML).orElseThrow();
+
+		// Then
+		assertEquals(ContentType.TEXT_HTML, response.contentType());
+		assertEquals(MOCK_PDF_BYTES, new String(response.data().readAllBytes()));
+		assertTrue(response.retrieveHeader(SAMPLE_HEADER).isEmpty());
+		verify(getRequestedFor(urlPathEqualTo(expectedEndpoint)));
+	}
+
 	@DisplayName("When AEM returns 500 Internal Server error with no body, postToServer should throw RestClientException.")
 	@Test
 	void testGetFromServer_AemReturns500NoBody() throws Exception {