From 2531fc9a8df75b1b6924088685e40aa95468af8a Mon Sep 17 00:00:00 2001 From: Nicola Dardanis Date: Wed, 31 Jan 2024 15:23:33 +0100 Subject: [PATCH] refactor(GH-213): rename getSystemWorkspaceBuilder to getWorkspaceBuilder --- .../main/java/com/adobe/aio/util/WorkspaceUtil.java | 2 +- .../aio/ims/feign/FeignImsServiceIntegrationTest.java | 10 +++++----- .../adobe/aio/ims/feign/FeignImsServiceTestDrive.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ims/src/main/java/com/adobe/aio/util/WorkspaceUtil.java b/ims/src/main/java/com/adobe/aio/util/WorkspaceUtil.java index 99438a31..9548233a 100644 --- a/ims/src/main/java/com/adobe/aio/util/WorkspaceUtil.java +++ b/ims/src/main/java/com/adobe/aio/util/WorkspaceUtil.java @@ -40,7 +40,7 @@ private WorkspaceUtil() { * * @return a Workspace.Builder loaded with the provided config */ - public static Workspace.Builder getSystemWorkspaceBuilder() { + public static Workspace.Builder getWorkspaceBuilder() { if (StringUtils.isNoneBlank( System.getProperty(PrivateKeyBuilder.AIO_ENCODED_PKCS_8), System.getProperty(Workspace.API_KEY), diff --git a/ims/src/test/java/com/adobe/aio/ims/feign/FeignImsServiceIntegrationTest.java b/ims/src/test/java/com/adobe/aio/ims/feign/FeignImsServiceIntegrationTest.java index 1c1b770b..b2464a4a 100644 --- a/ims/src/test/java/com/adobe/aio/ims/feign/FeignImsServiceIntegrationTest.java +++ b/ims/src/test/java/com/adobe/aio/ims/feign/FeignImsServiceIntegrationTest.java @@ -28,7 +28,7 @@ public class FeignImsServiceIntegrationTest { @Test public void getAndValidateJwtExchangeAccessToken() { - Workspace workspace = WorkspaceUtil.getSystemWorkspaceBuilder().build(); + Workspace workspace = WorkspaceUtil.getWorkspaceBuilder().build(); ImsService imsService = ImsService.builder().workspace(workspace).build(); AccessToken accessToken = imsService.getJwtExchangeAccessToken(); logger.info("JWT Exchange token flow complete"); @@ -41,28 +41,28 @@ public void getAndValidateJwtExchangeAccessToken() { @Test public void getAndValidateJwtExchangeAccessTokenWithBadApiKey() { - Workspace workspace = WorkspaceUtil.getSystemWorkspaceBuilder().apiKey("bad_api_key").build(); + Workspace workspace = WorkspaceUtil.getWorkspaceBuilder().apiKey("bad_api_key").build(); ImsService imsService = ImsService.builder().workspace(workspace).build(); assertThrows(FeignException.BadRequest.class, imsService::getJwtExchangeAccessToken); } @Test public void getAndValidateJwtExchangeAccessTokenWithBadSecret() { - Workspace workspace = WorkspaceUtil.getSystemWorkspaceBuilder().clientSecret("bad_secret").build(); + Workspace workspace = WorkspaceUtil.getWorkspaceBuilder().clientSecret("bad_secret").build(); ImsService imsService = ImsService.builder().workspace(workspace).build(); assertThrows(FeignException.BadRequest.class, imsService::getJwtExchangeAccessToken); } @Test public void getAndValidateJwtExchangeAccessTokenWithBadTechAccount() { - Workspace workspace = WorkspaceUtil.getSystemWorkspaceBuilder().technicalAccountId("bad_tech_account_id@techacct.adobe.com").build(); + Workspace workspace = WorkspaceUtil.getWorkspaceBuilder().technicalAccountId("bad_tech_account_id@techacct.adobe.com").build(); ImsService imsService = ImsService.builder().workspace(workspace).build(); assertThrows(FeignException.BadRequest.class, imsService::getJwtExchangeAccessToken); } @Test public void getAndValidateJwtExchangeAccessTokenWithMissingPrivateKey() { - Workspace workspace = WorkspaceUtil.getSystemWorkspaceBuilder().privateKey(null).build(); + Workspace workspace = WorkspaceUtil.getWorkspaceBuilder().privateKey(null).build(); assertThrows(IllegalStateException.class, () -> ImsService.builder().workspace(workspace).build()); } } diff --git a/ims/src/test/java/com/adobe/aio/ims/feign/FeignImsServiceTestDrive.java b/ims/src/test/java/com/adobe/aio/ims/feign/FeignImsServiceTestDrive.java index 4dcead17..7f0ff18b 100644 --- a/ims/src/test/java/com/adobe/aio/ims/feign/FeignImsServiceTestDrive.java +++ b/ims/src/test/java/com/adobe/aio/ims/feign/FeignImsServiceTestDrive.java @@ -59,7 +59,7 @@ public static void runTheReadmeFile() { public static void main(String[] args) { try { - Workspace workspace = WorkspaceUtil.getSystemWorkspaceBuilder().build(); + Workspace workspace = WorkspaceUtil.getWorkspaceBuilder().build(); ImsService imsService = ImsService.builder().workspace(workspace).build(); AccessToken accessToken = imsService.getJwtExchangeAccessToken();