Refactoring + Repackage (#80)

* Repackaging and refactoring
* Added Update Application Role Connection Metadata API
* Refactoring packages in tests to align with their counterpart code
* Formatting
* Added unit tests
* Created unit test for `ThreadMember` and updated timestamps to `yyyy-MM-dd'T'HH:mm:ssX`
* Added DiscordImageUtil

Author: surajkumar

build.gradle

@@ -19,6 +19,7 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-core:2.17.0'
     implementation 'com.fasterxml.jackson.core:jackson-annotations:2.17.0'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0'
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0'
 
     implementation 'com.github.mizosoft.methanol:methanol:1.7.0'
 

mocks/README.md

@@ -4,7 +4,7 @@ By leveraging either an OpenAPI spec or crafting scenarios, Imposter empowers de
 
 ## Leveraging Discord's OpenAPI Spec
 Within this repository, we use the capabilities of Imposter by utilizing Discord's OpenAPI spec to automatically generate test endpoints. 
-These endpoints serve as assets for composing integration tests for our bot.
+These endpoints serve as assets for composing integration tests for our framework.
 
 ## Getting Started
 
@@ -28,7 +28,7 @@ imposter up
 
 This will start a mock server at `http://localhost:8080`
 
-Test everything is working by using a REST client such as Postman and make a call to `http://localhost:8080//api/v10/oauth2/applications/@me`. 
+Test everything is working by using a REST client such as Postman and make a call to `http://localhost:8080/api/v10/oauth2/applications/@me`. 
 You should see: 
 ```json
 {

src/main/java/com/javadiscord/jdi/core/Discord.java

@@ -31,9 +31,11 @@ public class Discord {
     private static final Executor EXECUTOR = Executors.newCachedThreadPool();
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
     private static final String WEBSITE = "https://javadiscord.com/";
+
     private static final String BASE_URL = System.getProperty("DISCORD_BASE_URL") != null
         ? System.getProperty("DISCORD_BASE_URL")
         : "https://discord.com/api";
+
     private final String botToken;
     private final IdentifyRequest identifyRequest;
     private final DiscordRequestDispatcher discordRequestDispatcher;

src/main/java/com/javadiscord/jdi/core/cache/Cache.java

@@ -29,7 +29,7 @@ public Map<Long, CacheInterface> getCachedGuilds() {
         return cache;
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public void cacheGuild(Guild guild) {
         CacheInterface cacheInterface = getCacheForType();
         cacheInterface.add(guild.id(), guild);

src/main/java/com/javadiscord/jdi/core/processor/ClassFileUtil.java

@@ -25,26 +25,8 @@ public static List<File> getClassesInClassPath() {
         return classes;
     }
 
-    private static List<File> getClasses(File file) {
-        List<File> classes = new ArrayList<>();
-        if (file.isDirectory()) {
-            File[] files = file.listFiles();
-            if (files != null) {
-                for (File f : files) {
-                    classes.addAll(getClasses(f));
-                }
-            }
-        } else {
-            if (file.getName().endsWith(".class")) {
-                classes.add(file);
-            }
-        }
-        return classes;
-    }
-
     public static String getClassName(File file) throws IOException {
         String className = null;
-
         try (
             FileInputStream fis = new FileInputStream(file);
             DataInputStream dis = new DataInputStream(fis)
@@ -63,10 +45,26 @@ public static String getClassName(File file) throws IOException {
                 className = extractClassName(dis);
             }
         }
-
         return className;
     }
 
+    private static List<File> getClasses(File file) {
+        List<File> classes = new ArrayList<>();
+        if (file.isDirectory()) {
+            File[] files = file.listFiles();
+            if (files != null) {
+                for (File f : files) {
+                    classes.addAll(getClasses(f));
+                }
+            }
+        } else {
+            if (file.getName().endsWith(".class")) {
+                classes.add(file);
+            }
+        }
+        return classes;
+    }
+
     private static boolean isJarFile(File file) {
         return file.getName().toLowerCase().endsWith(".jar");
     }

src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestBuilder.java

@@ -24,11 +24,6 @@ public DiscordRequestBuilder putHeader(String name, Object value) {
         return this;
     }
 
-    public DiscordRequestBuilder putHeaders(Map<String, Object> headers) {
-        this.headers.putAll(headers);
-        return this;
-    }
-
     public DiscordRequestBuilder path(String path) {
         this.path = path;
         return this;
@@ -39,11 +34,6 @@ public DiscordRequestBuilder queryParam(String name, Object value) {
         return this;
     }
 
-    public DiscordRequestBuilder queryParams(Map<String, Object> queryParameters) {
-        this.queryParameters.putAll(queryParameters);
-        return this;
-    }
-
     /**
      * @param payload Commonly represented as an Map<String, Object>
      */

src/main/java/com/javadiscord/jdi/internal/api/impl/application/EditCurrentApplicationRequest.java renamed to src/main/java/com/javadiscord/jdi/internal/api/application/EditCurrentApplicationRequest.java

@@ -1,21 +1,23 @@
-package com.javadiscord.jdi.internal.api.impl.application;
+package com.javadiscord.jdi.internal.api.application;
 
+import java.util.List;
 import java.util.Map;
 
 import com.javadiscord.jdi.internal.api.DiscordRequest;
 import com.javadiscord.jdi.internal.api.DiscordRequestBuilder;
+import com.javadiscord.jdi.internal.models.application.ApplicationInstallParams;
 
 public record EditCurrentApplicationRequest(
     String customInstallUrl,
     String description,
     String roleConnectionsVerificationUrl,
-    Object installParams, // TODO: Create Install Params object
+    ApplicationInstallParams installParams,
     Map<String, Object> integrationTypesConfig,
     int flags,
-    String icon, // Image data, set as String for now
-    String coverImage, // Image data, set as String for now
+    String icon,
+    String coverImage,
     String interactionsEndpointUrl,
-    String[] tags
+    List<String> tags
 )
     implements DiscordRequest {
 

src/main/java/com/javadiscord/jdi/internal/api/impl/application/GetCurrentApplicationRequest.java renamed to src/main/java/com/javadiscord/jdi/internal/api/application/GetCurrentApplicationRequest.java

@@ -1,4 +1,4 @@
-package com.javadiscord.jdi.internal.api.impl.application;
+package com.javadiscord.jdi.internal.api.application;
 
 import com.javadiscord.jdi.internal.api.DiscordRequest;
 import com.javadiscord.jdi.internal.api.DiscordRequestBuilder;

src/main/java/com/javadiscord/jdi/internal/api/application_role_connection_metadata/GetApplicationRoleConnectionMetadataRecords.java

@@ -0,0 +1,14 @@
+package com.javadiscord.jdi.internal.api.application_role_connection_metadata;
+
+import com.javadiscord.jdi.internal.api.DiscordRequest;
+import com.javadiscord.jdi.internal.api.DiscordRequestBuilder;
+
+public record GetApplicationRoleConnectionMetadataRecords(long applicationId) implements DiscordRequest {
+
+    @Override
+    public DiscordRequestBuilder create() {
+        return new DiscordRequestBuilder()
+            .path("/applications/%s/role-connections/metadata".formatted(applicationId))
+            .get();
+    }
+}

src/main/java/com/javadiscord/jdi/internal/api/application_role_connection_metadata/UpdateApplicationRoleConnectionMetadataRecords.java

@@ -0,0 +1,20 @@
+package com.javadiscord.jdi.internal.api.application_role_connection_metadata;
+
+import com.javadiscord.jdi.internal.api.DiscordRequest;
+import com.javadiscord.jdi.internal.api.DiscordRequestBuilder;
+import com.javadiscord.jdi.internal.models.application.ApplicationRoleConnectionMetadata;
+
+public record UpdateApplicationRoleConnectionMetadataRecords(
+    long applicationId,
+    ApplicationRoleConnectionMetadata applicationRoleConnectionMetadata
+)
+    implements DiscordRequest {
+
+    @Override
+    public DiscordRequestBuilder create() {
+        return new DiscordRequestBuilder()
+            .path("/applications/%s/role-connections/metadata".formatted(applicationId))
+            .put()
+            .body(applicationRoleConnectionMetadata);
+    }
+}