Fix initializing credit pools and servers returned by bulk endpoints

Author: JulianVennen

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2.2.1
+## Added
+- `CreditPool#getClient()`
+
+## Fixed
+- Objects returned by `ExarotonClient#getServers` and `ExarotonClient#getCreditPools` are now correctly initialized
+
 # 2.2.0
 
 ## Added

README.md

@@ -13,7 +13,7 @@ If you're creating a plugin/mod that runs on an exaroton server, you can get the
 Gradle:
 ```gradle
 dependencies {
-    implementation 'com.exaroton:api:2.2.0'
+    implementation 'com.exaroton:api:2.2.1'
 }
 ```
 
@@ -22,7 +22,7 @@ Maven:
 <dependency>
   <groupId>com.exaroton</groupId>
   <artifactId>api</artifactId>
-  <version>2.2.0</version>
+  <version>2.2.1</version>
 </dependency>
 ```
 

src/main/java/com/exaroton/api/APIResponse.java

@@ -111,14 +111,33 @@ public CompletionStage<APIResponse<T>> getBody() {
                     return CompletableFuture.failedFuture(new APIException(response.getError()));
                 }
 
-                if (response.getData() instanceof Initializable) {
-                    ((Initializable) response.getData()).initialize(client, gson);
-                }
+                initialize(response.getData());
 
                 return CompletableFuture.completedFuture(response);
             });
         }
 
+        /**
+         * Initialize an object with the API client and gson instance. This will call initialize on object that
+         * implements Initializable or initialize all objects in an Iterable.
+         * @param object object to initialize
+         */
+        private void initialize(Object object) {
+            if (object == null) {
+                return;
+            }
+
+            if (object instanceof Iterable<?>) {
+                for (Object item : (Iterable<?>) object) {
+                    initialize(item);
+                }
+            }
+
+            if (object instanceof Initializable) {
+                ((Initializable) object).initialize(client, gson);
+            }
+        }
+
         @Override
         public void onSubscribe(Flow.Subscription subscription) {
             parent.onSubscribe(subscription);

src/main/java/com/exaroton/api/billing/pools/CreditPool.java

@@ -69,7 +69,6 @@ public final class CreditPool implements Initializable {
     /**
      * The client used to create this pool
      */
-    @NotNull
     private transient ExarotonClient client;
 
     /**
@@ -173,6 +172,15 @@ public double getOwnCredits() {
         return ownCredits;
     }
 
+    /**
+     * get the exaroton client used to create this server
+     *
+     * @return exaroton client used to create this server
+     */
+    public ExarotonClient getClient() {
+        return client;
+    }
+
     /**
      * Set the exaroton client used for further requests
      *

src/test/java/CreditPoolsTest.java

@@ -9,19 +9,26 @@
 import java.util.List;
 import java.util.Optional;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class CreditPoolsTest extends APIClientTest {
     private static final @NotNull String TEST_POOL_ID = System.getenv("EXAROTON_TEST_POOL");
 
     @Test
     public void testGetCreditPools() throws IOException {
         List<CreditPool> pools = client.getCreditPools().join();
-        Assertions.assertNotNull(pools);
+        assertNotNull(pools);
         Assertions.assertFalse(pools.isEmpty(), "Expected at least one pool, got none");
         checkTestPool(pools.stream().filter(pool -> pool.getId().equals(TEST_POOL_ID)).findFirst().orElse(null));
+
+        for (var pool : pools) {
+            assertNotNull(pool.getId());
+            assertNotNull(pool.getClient());
+        }
     }
 
     private void checkTestPool(CreditPool pool) {
-        Assertions.assertNotNull(pool);
+        assertNotNull(pool);
         Assertions.assertEquals(TEST_POOL_ID, pool.getId());
         Assertions.assertEquals("eAPI tests", pool.getName());
         double poolCredits = pool.getCredits();
@@ -58,20 +65,20 @@ public void testGetPoolCache() throws IOException {
     public void testGetPoolMembers() throws IOException {
         CreditPool pool = client.getCreditPool(TEST_POOL_ID);
         List<CreditPoolMember> members = pool.getMemberList().join();
-        Assertions.assertNotNull(members);
+        assertNotNull(members);
         Assertions.assertEquals(2, members.size());
 
         Optional<CreditPoolMember> owner = members.stream().filter(CreditPoolMember::isOwner).findFirst();
         Assertions.assertTrue(owner.isPresent());
-        Assertions.assertNotNull(owner.get().getAccount());
-        Assertions.assertNotNull(owner.get().getName());
+        assertNotNull(owner.get().getAccount());
+        assertNotNull(owner.get().getName());
         Assertions.assertTrue(owner.get().isOwner());
         Assertions.assertTrue(owner.get().getCredits() > 100, "Expected owner to have more than 100 credits, got " + owner.get().getCredits());
         Assertions.assertEquals(1, owner.get().getShare());
 
         Optional<CreditPoolMember> other = members.stream().filter(member -> !member.isOwner()).findFirst();
         Assertions.assertTrue(other.isPresent());
-        Assertions.assertNotNull(other.get().getAccount());
+        assertNotNull(other.get().getAccount());
         Assertions.assertFalse(other.get().isOwner());
         Assertions.assertEquals(0, other.get().getCredits());
         Assertions.assertEquals(0, other.get().getShare());
@@ -81,7 +88,7 @@ public void testGetPoolMembers() throws IOException {
     public void testGetPoolServers() throws IOException {
         CreditPool pool = client.getCreditPool(TEST_POOL_ID);
         List<Server> servers = pool.getServerList().join();
-        Assertions.assertNotNull(servers);
+        assertNotNull(servers);
         Assertions.assertEquals(1, servers.size());
         Assertions.assertEquals(TEST_SERVER_ID, servers.get(0).getId());
     }

src/test/java/ServerTest.java

@@ -13,6 +13,7 @@ void testGetServers() throws IOException {
         List<Server> servers = client.getServers().join();
         assertNotNull(servers);
         for (Server server : servers) {
+            assertNotNull(server.getClient());
             assertNotNull(server.getAddress());
             assertNotNull(server.getName());
             assertNotNull(server.getId());