Update README.md

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Dev Build
+name: Build
 
 on:
   push:

README.md

@@ -14,9 +14,9 @@ I downgraded the repo from JDK 17 to JDK 11 as well.
 To add `elevenlabs-api` to your Maven project, use:
 ```xml
 <dependency>
-    <groupId>net.andrewcpu.elevenlabs</groupId>
+    <groupId>net.andrewcpu</groupId>
     <artifactId>elevenlabs-api</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.1</version>
 </dependency>
 ```
 The most up-to date package information can be found on the [Packages tab](https://github.com/AndrewCPU/elevenlabs-api/packages/)

pom.xml

@@ -34,7 +34,7 @@
 
     <groupId>net.andrewcpu</groupId>
     <artifactId>elevenlabs-api</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

src/main/java/net/andrewcpu/elevenlabs/ElevenLabs.java

@@ -9,16 +9,16 @@ import net.andrewcpu.elevenlabs.model.user.Subscription;
 import net.andrewcpu.elevenlabs.model.user.User;
 import net.andrewcpu.elevenlabs.model.voice.Voice;
 import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
-import net.andrewcpu.elevenlabs.net.ElevenRequest;
-import net.andrewcpu.elevenlabs.net.history.*;
-import net.andrewcpu.elevenlabs.net.models.GetModelsRequest;
-import net.andrewcpu.elevenlabs.net.samples.DeleteSampleRequest;
-import net.andrewcpu.elevenlabs.net.samples.GetSampleRequest;
-import net.andrewcpu.elevenlabs.net.tts.PostTextToSpeechRequest;
-import net.andrewcpu.elevenlabs.net.tts.PostTextToSpeechStreamedRequest;
-import net.andrewcpu.elevenlabs.net.user.GetSubscriptionRequest;
-import net.andrewcpu.elevenlabs.net.user.GetUserRequest;
-import net.andrewcpu.elevenlabs.net.voices.*;
+import net.andrewcpu.elevenlabs.requests.ElevenLabsRequest;
+import net.andrewcpu.elevenlabs.requests.history.*;
+import net.andrewcpu.elevenlabs.requests.models.GetModelsRequest;
+import net.andrewcpu.elevenlabs.requests.samples.DeleteSampleRequest;
+import net.andrewcpu.elevenlabs.requests.samples.GetSampleRequest;
+import net.andrewcpu.elevenlabs.requests.tts.PostTextToSpeechRequest;
+import net.andrewcpu.elevenlabs.requests.tts.PostTextToSpeechStreamedRequest;
+import net.andrewcpu.elevenlabs.requests.user.GetSubscriptionRequest;
+import net.andrewcpu.elevenlabs.requests.user.GetUserRequest;
+import net.andrewcpu.elevenlabs.requests.voices.*;
 import net.andrewcpu.elevenlabs.util.ElevenNetworkUtil;
 
 import java.io.File;
@@ -37,7 +37,7 @@ public class ElevenLabs {
 		API_KEY = apiKey;
 	}
 
-	private static <T> T sendRequest(ElevenRequest<T> request) {
+	private static <T> T sendRequest(ElevenLabsRequest<T> request) {
 		return ElevenNetworkUtil.sendRequest(request.getType(),request.getEndpoint(), request.getPayload(),request.getResponseClass());
 	}
 

src/main/java/net/andrewcpu/elevenlabs/enums/HttpRequestType.java

@@ -1,4 +1,4 @@
-package net.andrewcpu.elevenlabs;
+package net.andrewcpu.elevenlabs.enums;
 
 public enum HttpRequestType {
 	POST, GET, PUT, DELETE;

src/main/java/net/andrewcpu/elevenlabs/net/DeleteRequest.java

@@ -1,9 +0,0 @@
-package net.andrewcpu.elevenlabs.net;
-
-import net.andrewcpu.elevenlabs.HttpRequestType;
-
-public abstract class DeleteRequest<T> extends ElevenRequest<T> {
-	public DeleteRequest(String endpoint, Class<T> clazz) {
-		super(HttpRequestType.DELETE, endpoint, clazz);
-	}
-}

src/main/java/net/andrewcpu/elevenlabs/net/GetRequest.java

@@ -1,9 +0,0 @@
-package net.andrewcpu.elevenlabs.net;
-
-import net.andrewcpu.elevenlabs.HttpRequestType;
-
-public abstract class GetRequest<T> extends ElevenRequest<T> {
-	public GetRequest(String endpoint, Class<T> clazz) {
-		super(HttpRequestType.GET, endpoint, clazz);
-	}
-}

src/main/java/net/andrewcpu/elevenlabs/net/PostRequest.java

@@ -1,9 +0,0 @@
-package net.andrewcpu.elevenlabs.net;
-
-import net.andrewcpu.elevenlabs.HttpRequestType;
-
-public abstract class PostRequest<T> extends ElevenRequest<T> {
-	public PostRequest(String endpoint, Class<T> clazz) {
-		super(HttpRequestType.POST, endpoint, clazz);
-	}
-}

src/main/java/net/andrewcpu/elevenlabs/net/PutRequest.java

@@ -1,9 +0,0 @@
-package net.andrewcpu.elevenlabs.net;
-
-import net.andrewcpu.elevenlabs.HttpRequestType;
-
-public abstract class PutRequest<T> extends ElevenRequest<T> {
-	public PutRequest(String endpoint, Class<T> clazz) {
-		super(HttpRequestType.PUT, endpoint, clazz);
-	}
-}

src/main/java/net/andrewcpu/elevenlabs/requests/DeleteRequest.java

@@ -0,0 +1,9 @@
+package net.andrewcpu.elevenlabs.requests;
+
+import net.andrewcpu.elevenlabs.enums.HttpRequestType;
+
+public abstract class DeleteRequest<T> extends ElevenLabsRequest<T> {
+	public DeleteRequest(String endpoint, Class<T> clazz) {
+		super(HttpRequestType.DELETE, endpoint, clazz);
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/requests/ElevenLabsRequest.java

@@ -1,14 +1,13 @@
-package net.andrewcpu.elevenlabs.net;
+package net.andrewcpu.elevenlabs.requests;
 
-import net.andrewcpu.elevenlabs.HttpRequestType;
-import net.andrewcpu.elevenlabs.util.ElevenNetworkUtil;
+import net.andrewcpu.elevenlabs.enums.HttpRequestType;
 
-public abstract class ElevenRequest<T> {
+public abstract class ElevenLabsRequest<T> {
 	private HttpRequestType type;
 	private String endpoint;
 	private Class<T> responseClass;
 
-	public ElevenRequest(HttpRequestType type, String endpoint, Class<T> clazz) {
+	public ElevenLabsRequest(HttpRequestType type, String endpoint, Class<T> clazz) {
 		this.type = type;
 		this.endpoint = endpoint;
 		this.responseClass = clazz;

src/main/java/net/andrewcpu/elevenlabs/requests/GetRequest.java

@@ -0,0 +1,9 @@
+package net.andrewcpu.elevenlabs.requests;
+
+import net.andrewcpu.elevenlabs.enums.HttpRequestType;
+
+public abstract class GetRequest<T> extends ElevenLabsRequest<T> {
+	public GetRequest(String endpoint, Class<T> clazz) {
+		super(HttpRequestType.GET, endpoint, clazz);
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/requests/PostRequest.java

@@ -0,0 +1,9 @@
+package net.andrewcpu.elevenlabs.requests;
+
+import net.andrewcpu.elevenlabs.enums.HttpRequestType;
+
+public abstract class PostRequest<T> extends ElevenLabsRequest<T> {
+	public PostRequest(String endpoint, Class<T> clazz) {
+		super(HttpRequestType.POST, endpoint, clazz);
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/requests/PutRequest.java

@@ -0,0 +1,9 @@
+package net.andrewcpu.elevenlabs.requests;
+
+import net.andrewcpu.elevenlabs.enums.HttpRequestType;
+
+public abstract class PutRequest<T> extends ElevenLabsRequest<T> {
+	public PutRequest(String endpoint, Class<T> clazz) {
+		super(HttpRequestType.PUT, endpoint, clazz);
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/requests/history/DeleteHistoryItemRequest.java

@@ -1,6 +1,6 @@
-package net.andrewcpu.elevenlabs.net.history;
+package net.andrewcpu.elevenlabs.requests.history;
 
-import net.andrewcpu.elevenlabs.net.DeleteRequest;
+import net.andrewcpu.elevenlabs.requests.DeleteRequest;
 
 public class DeleteHistoryItemRequest extends DeleteRequest<String> {
 	public DeleteHistoryItemRequest(String historyItemId) {

src/main/java/net/andrewcpu/elevenlabs/requests/history/GetHistoryItemAudioRequest.java

@@ -1,6 +1,6 @@
-package net.andrewcpu.elevenlabs.net.history;
+package net.andrewcpu.elevenlabs.requests.history;
 
-import net.andrewcpu.elevenlabs.net.GetRequest;
+import net.andrewcpu.elevenlabs.requests.GetRequest;
 
 import java.io.File;
 

src/main/java/net/andrewcpu/elevenlabs/requests/history/GetHistoryItemByIdRequest.java

@@ -1,7 +1,7 @@
-package net.andrewcpu.elevenlabs.net.history;
+package net.andrewcpu.elevenlabs.requests.history;
 
 import net.andrewcpu.elevenlabs.model.history.HistoryItem;
-import net.andrewcpu.elevenlabs.net.GetRequest;
+import net.andrewcpu.elevenlabs.requests.GetRequest;
 
 public class GetHistoryItemByIdRequest extends GetRequest<HistoryItem> {
 	public GetHistoryItemByIdRequest(String historyId) {

src/main/java/net/andrewcpu/elevenlabs/requests/history/GetHistoryRequest.java

@@ -1,7 +1,7 @@
-package net.andrewcpu.elevenlabs.net.history;
+package net.andrewcpu.elevenlabs.requests.history;
 
 import net.andrewcpu.elevenlabs.model.history.History;
-import net.andrewcpu.elevenlabs.net.GetRequest;
+import net.andrewcpu.elevenlabs.requests.GetRequest;
 
 public class GetHistoryRequest extends GetRequest<History> {
 	public GetHistoryRequest() {

src/main/java/net/andrewcpu/elevenlabs/requests/history/PostDownloadHistoryItemsRequest.java

@@ -1,7 +1,7 @@
-package net.andrewcpu.elevenlabs.net.history;
+package net.andrewcpu.elevenlabs.requests.history;
 
 import net.andrewcpu.elevenlabs.model.history.HistoryItemList;
-import net.andrewcpu.elevenlabs.net.PostRequest;
+import net.andrewcpu.elevenlabs.requests.PostRequest;
 
 import java.io.File;
 import java.util.Arrays;

src/main/java/net/andrewcpu/elevenlabs/requests/models/GetModelsRequest.java

@@ -1,7 +1,7 @@
-package net.andrewcpu.elevenlabs.net.models;
+package net.andrewcpu.elevenlabs.requests.models;
 
 import net.andrewcpu.elevenlabs.model.response.GenerationTypeModel;
-import net.andrewcpu.elevenlabs.net.GetRequest;
+import net.andrewcpu.elevenlabs.requests.GetRequest;
 
 public class GetModelsRequest extends GetRequest<GenerationTypeModel[]> {
 	public GetModelsRequest() {

src/main/java/net/andrewcpu/elevenlabs/requests/samples/DeleteSampleRequest.java

@@ -1,6 +1,6 @@
-package net.andrewcpu.elevenlabs.net.samples;
+package net.andrewcpu.elevenlabs.requests.samples;
 
-import net.andrewcpu.elevenlabs.net.DeleteRequest;
+import net.andrewcpu.elevenlabs.requests.DeleteRequest;
 
 public class DeleteSampleRequest extends DeleteRequest<String> {
 	public DeleteSampleRequest(String voiceId, String sampleId) {

src/main/java/net/andrewcpu/elevenlabs/requests/samples/GetSampleRequest.java

@@ -1,6 +1,6 @@
-package net.andrewcpu.elevenlabs.net.samples;
+package net.andrewcpu.elevenlabs.requests.samples;
 
-import net.andrewcpu.elevenlabs.net.GetRequest;
+import net.andrewcpu.elevenlabs.requests.GetRequest;
 
 import java.io.File;
 

src/main/java/net/andrewcpu/elevenlabs/requests/tts/PostTextToSpeechRequest.java

@@ -1,7 +1,7 @@
-package net.andrewcpu.elevenlabs.net.tts;
+package net.andrewcpu.elevenlabs.requests.tts;
 
 import net.andrewcpu.elevenlabs.model.request.TextToSpeechRequest;
-import net.andrewcpu.elevenlabs.net.PostRequest;
+import net.andrewcpu.elevenlabs.requests.PostRequest;
 
 import java.io.File;
 

src/main/java/net/andrewcpu/elevenlabs/requests/tts/PostTextToSpeechStreamedRequest.java

@@ -1,9 +1,8 @@
-package net.andrewcpu.elevenlabs.net.tts;
+package net.andrewcpu.elevenlabs.requests.tts;
 
 import net.andrewcpu.elevenlabs.model.request.TextToSpeechRequest;
-import net.andrewcpu.elevenlabs.net.PostRequest;
+import net.andrewcpu.elevenlabs.requests.PostRequest;
 
-import java.io.File;
 import java.io.InputStream;
 
 public class PostTextToSpeechStreamedRequest extends PostRequest<InputStream> {

src/main/java/net/andrewcpu/elevenlabs/requests/user/GetSubscriptionRequest.java

@@ -1,7 +1,7 @@
-package net.andrewcpu.elevenlabs.net.user;
+package net.andrewcpu.elevenlabs.requests.user;
 
 import net.andrewcpu.elevenlabs.model.user.Subscription;
-import net.andrewcpu.elevenlabs.net.GetRequest;
+import net.andrewcpu.elevenlabs.requests.GetRequest;
 
 public class GetSubscriptionRequest extends GetRequest<Subscription> {
 

src/main/java/net/andrewcpu/elevenlabs/requests/user/GetUserRequest.java

@@ -1,7 +1,7 @@
-package net.andrewcpu.elevenlabs.net.user;
+package net.andrewcpu.elevenlabs.requests.user;
 
 import net.andrewcpu.elevenlabs.model.user.User;
-import net.andrewcpu.elevenlabs.net.GetRequest;
+import net.andrewcpu.elevenlabs.requests.GetRequest;
 
 public class GetUserRequest extends GetRequest<User> {
 	public GetUserRequest() {

src/main/java/net/andrewcpu/elevenlabs/requests/voices/DeleteVoiceRequest.java

@@ -1,6 +1,6 @@
-package net.andrewcpu.elevenlabs.net.voices;
+package net.andrewcpu.elevenlabs.requests.voices;
 
-import net.andrewcpu.elevenlabs.net.DeleteRequest;
+import net.andrewcpu.elevenlabs.requests.DeleteRequest;
 
 public class DeleteVoiceRequest extends DeleteRequest<String> {
 	public DeleteVoiceRequest(String voiceId) {

src/main/java/net/andrewcpu/elevenlabs/requests/voices/GetDefaultVoiceSettingsRequest.java

@@ -1,7 +1,7 @@
-package net.andrewcpu.elevenlabs.net.voices;
+package net.andrewcpu.elevenlabs.requests.voices;
 
 import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
-import net.andrewcpu.elevenlabs.net.GetRequest;
+import net.andrewcpu.elevenlabs.requests.GetRequest;
 
 public class GetDefaultVoiceSettingsRequest extends GetRequest<VoiceSettings> {
 	public GetDefaultVoiceSettingsRequest() {

src/main/java/net/andrewcpu/elevenlabs/requests/voices/GetVoiceRequest.java

@@ -1,7 +1,7 @@
-package net.andrewcpu.elevenlabs.net.voices;
+package net.andrewcpu.elevenlabs.requests.voices;
 
 import net.andrewcpu.elevenlabs.model.voice.Voice;
-import net.andrewcpu.elevenlabs.net.GetRequest;
+import net.andrewcpu.elevenlabs.requests.GetRequest;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/net/andrewcpu/elevenlabs/requests/voices/GetVoiceSettingsRequest.java

@@ -1,7 +1,7 @@
-package net.andrewcpu.elevenlabs.net.voices;
+package net.andrewcpu.elevenlabs.requests.voices;
 
 import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
-import net.andrewcpu.elevenlabs.net.GetRequest;
+import net.andrewcpu.elevenlabs.requests.GetRequest;
 
 public class GetVoiceSettingsRequest extends GetRequest<VoiceSettings> {
 	public GetVoiceSettingsRequest(String voiceId) {

src/main/java/net/andrewcpu/elevenlabs/requests/voices/GetVoicesRequest.java

@@ -1,7 +1,7 @@
-package net.andrewcpu.elevenlabs.net.voices;
+package net.andrewcpu.elevenlabs.requests.voices;
 
 import net.andrewcpu.elevenlabs.model.response.VoiceModelResponse;
-import net.andrewcpu.elevenlabs.net.GetRequest;
+import net.andrewcpu.elevenlabs.requests.GetRequest;
 
 public class GetVoicesRequest extends GetRequest<VoiceModelResponse> {
 	public GetVoicesRequest() {

src/main/java/net/andrewcpu/elevenlabs/requests/voices/PostAddVoiceRequest.java

@@ -1,7 +1,7 @@
-package net.andrewcpu.elevenlabs.net.voices;
+package net.andrewcpu.elevenlabs.requests.voices;
 
 import net.andrewcpu.elevenlabs.model.response.CreateVoiceResponse;
-import net.andrewcpu.elevenlabs.net.PostRequest;
+import net.andrewcpu.elevenlabs.requests.PostRequest;
 
 import java.io.File;
 import java.util.HashMap;

src/main/java/net/andrewcpu/elevenlabs/requests/voices/PostEditVoiceRequest.java

@@ -1,7 +1,6 @@
-package net.andrewcpu.elevenlabs.net.voices;
+package net.andrewcpu.elevenlabs.requests.voices;
 
-import net.andrewcpu.elevenlabs.model.response.CreateVoiceResponse;
-import net.andrewcpu.elevenlabs.net.PostRequest;
+import net.andrewcpu.elevenlabs.requests.PostRequest;
 
 import java.io.File;
 import java.util.HashMap;

src/main/java/net/andrewcpu/elevenlabs/requests/voices/PostEditVoiceSettingsRequest.java

@@ -1,7 +1,7 @@
-package net.andrewcpu.elevenlabs.net.voices;
+package net.andrewcpu.elevenlabs.requests.voices;
 
 import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
-import net.andrewcpu.elevenlabs.net.PostRequest;
+import net.andrewcpu.elevenlabs.requests.PostRequest;
 
 public class PostEditVoiceSettingsRequest extends PostRequest<String> {
 	private VoiceSettings voiceSettings;

src/main/java/net/andrewcpu/elevenlabs/util/ElevenNetworkUtil.java

@@ -3,12 +3,10 @@ package net.andrewcpu.elevenlabs.util;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import net.andrewcpu.elevenlabs.ElevenLabs;
-import net.andrewcpu.elevenlabs.HttpRequestType;
+import net.andrewcpu.elevenlabs.enums.HttpRequestType;
 import net.andrewcpu.elevenlabs.exceptions.ValidationException;
 import net.andrewcpu.elevenlabs.model.error.ValidationError;
-import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.*;
-import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
 import org.apache.hc.client5.http.entity.mime.FileBody;
 import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
@@ -23,8 +21,6 @@ import org.apache.hc.core5.net.URIBuilder;
 
 import java.io.*;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.security.interfaces.DSAParams;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;