refactor(adobeGH-213): rename getSystemWorkspaceBuilder to getWorkspa…

…ceBuilder
nicdard · Jan 31, 2024 · 8f4162b · 8f4162b
1 parent cf036b0
commit 8f4162b
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/...ingress/src/test/java/com/adobe/aio/event/publish/feign/FeignPublishServiceTestDrive.java b/...ingress/src/test/java/com/adobe/aio/event/publish/feign/FeignPublishServiceTestDrive.java
@@ -28,7 +28,7 @@ public class FeignPublishServiceTestDrive {
 
   public static void main(String[] args) {
     try {
-      Workspace workspace = WorkspaceUtil.getSystemWorkspaceBuilder().build();
+      Workspace workspace = WorkspaceUtil.getWorkspaceBuilder().build();
       String providerId = WorkspaceUtil.getSystemProperty(AIO_PROVIDER_ID);
       String eventCode = WorkspaceUtil.getSystemProperty(AIO_EVENT_CODE);
 

diff --git a/...journal/src/test/java/com/adobe/aio/event/journal/feign/FeignJournalServiceTestDrive.java b/...journal/src/test/java/com/adobe/aio/event/journal/feign/FeignJournalServiceTestDrive.java
@@ -27,7 +27,7 @@ public class FeignJournalServiceTestDrive {
   public static void main(String[] args) {
     try {
 
-      Workspace workspace = WorkspaceUtil.getSystemWorkspaceBuilder().build();
+      Workspace workspace = WorkspaceUtil.getWorkspaceBuilder().build();
       String journalUrl = WorkspaceUtil.getSystemProperty(AIO_JOURNAL_URL);
       int nofEvents = 0;
       int nofEntries = 1;

diff --git a/...gmt/src/test/java/com/adobe/aio/event/management/feign/FeignProviderServiceTestDrive.java b/...gmt/src/test/java/com/adobe/aio/event/management/feign/FeignProviderServiceTestDrive.java
@@ -28,7 +28,7 @@ public class FeignProviderServiceTestDrive {
 
   public static void main(String[] args) {
     try {
-      Workspace workspace = WorkspaceUtil.getSystemWorkspaceBuilder().build();
+      Workspace workspace = WorkspaceUtil.getWorkspaceBuilder().build();
 
       ProviderService providerService = ProviderService.builder()
           .workspace(workspace) // [1]

diff --git a/...src/test/java/com/adobe/aio/event/management/feign/FeignRegistrationServiceTestDrive.java b/...src/test/java/com/adobe/aio/event/management/feign/FeignRegistrationServiceTestDrive.java
@@ -32,7 +32,7 @@ public class FeignRegistrationServiceTestDrive {
   public static void main(String[] args) {
     try {
 
-      Workspace workspace = WorkspaceUtil.getSystemWorkspaceBuilder().build();
+      Workspace workspace = WorkspaceUtil.getWorkspaceBuilder().build();
 
       RegistrationService registrationService = RegistrationService.builder()
           .workspace(workspace) // [1]

diff --git a/events_test/src/main/java/com/adobe/aio/event/journal/JournalServiceTester.java b/events_test/src/main/java/com/adobe/aio/event/journal/JournalServiceTester.java
@@ -46,7 +46,7 @@ public class JournalServiceTester {
   private final Workspace workspace;
 
   public JournalServiceTester() {
-    workspace = WorkspaceUtil.getSystemWorkspaceBuilder().build();
+    workspace = WorkspaceUtil.getWorkspaceBuilder().build();
   }
 
   public boolean pollJournalForEvent(String journalUrl, String eventId,

diff --git a/events_test/src/main/java/com/adobe/aio/event/management/ProviderServiceTester.java b/events_test/src/main/java/com/adobe/aio/event/management/ProviderServiceTester.java
@@ -38,7 +38,7 @@ public class ProviderServiceTester {
 
   public ProviderServiceTester() {
     this.providerService = ProviderService.builder()
-        .workspace(WorkspaceUtil.getSystemWorkspaceBuilder().build())
+        .workspace(WorkspaceUtil.getWorkspaceBuilder().build())
         .url(WorkspaceUtil.getSystemProperty(WorkspaceUtil.API_URL))
         .build();
   }

diff --git a/events_test/src/main/java/com/adobe/aio/event/management/RegistrationServiceTester.java b/events_test/src/main/java/com/adobe/aio/event/management/RegistrationServiceTester.java
@@ -39,7 +39,7 @@ public class RegistrationServiceTester {
   protected final RegistrationService registrationService;
 
   public RegistrationServiceTester() {
-    workspace = WorkspaceUtil.getSystemWorkspaceBuilder().build();
+    workspace = WorkspaceUtil.getWorkspaceBuilder().build();
     registrationService = RegistrationService.builder()
         .workspace(workspace)
         .url(WorkspaceUtil.getSystemProperty(WorkspaceUtil.API_URL))

diff --git a/events_test/src/main/java/com/adobe/aio/event/publish/PublishServiceTester.java b/events_test/src/main/java/com/adobe/aio/event/publish/PublishServiceTester.java
@@ -32,7 +32,7 @@ public class PublishServiceTester {
 
   public PublishServiceTester(){
     publishService = PublishService.builder()
-        .workspace(WorkspaceUtil.getSystemWorkspaceBuilder().build())
+        .workspace(WorkspaceUtil.getWorkspaceBuilder().build())
         .url(WorkspaceUtil.getSystemProperty(WorkspaceUtil.PUBLISH_URL))
         .build();
   }

diff --git a/events_test/src/test/java/com/adobe/aio/event/journal/JournalServiceIntegrationTest.java b/events_test/src/test/java/com/adobe/aio/event/journal/JournalServiceIntegrationTest.java
@@ -53,7 +53,7 @@ public void missingWorkspace() {
   public void missingUrl() {
     assertThrows(IllegalArgumentException.class, () ->
     JournalService.builder()
-        .workspace(WorkspaceUtil.getSystemWorkspaceBuilder().build())
+        .workspace(WorkspaceUtil.getWorkspaceBuilder().build())
         .build()
     );
   }

diff --git a/events_test/src/test/java/com/adobe/aio/event/management/ProviderServiceIntegrationTest.java b/events_test/src/test/java/com/adobe/aio/event/management/ProviderServiceIntegrationTest.java
@@ -43,7 +43,7 @@ public void missingWorkspace() {
   @Test
   public void getProvidersWithInvalidConsumerOrgId() {
     ProviderService providerService = ProviderService.builder()
-        .workspace(WorkspaceUtil.getSystemWorkspaceBuilder()
+        .workspace(WorkspaceUtil.getWorkspaceBuilder()
             .consumerOrgId("invalid").build())
         .url(WorkspaceUtil.getSystemProperty(WorkspaceUtil.API_URL))
         .build();

diff --git 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() {
    * </ol>
    * @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
@@ -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
@@ -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();