Updated to V2/ Added default language to builder, improvements

Author: thoo0224

pom.xml

@@ -17,6 +17,21 @@
                     <target>8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.3</version>
+                <configuration>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/com/thoo/api/BackendValue.java

@@ -0,0 +1,14 @@
+package com.thoo.api;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface BackendValue {
+
+    String value();
+
+}

src/main/java/com/thoo/api/FortniteAPIBuilder.java

@@ -1,16 +1,24 @@
 package com.thoo.api;
 
+import com.thoo.api.enums.Language;
+
 public final class FortniteAPIBuilder {
 
-    private String apiKey;
+    private String apiKey; // This is not required anymore.
+    private Language language = Language.EN;
 
     public FortniteAPIBuilder setKey(String apiKey){
         this.apiKey = apiKey;
         return this;
     }
 
+    public FortniteAPIBuilder setDefaultLanguage(Language language){
+        this.language = language;
+        return this;
+    }
+
     public FortniteAPI build(){
-        return new FortniteAPIImpl(apiKey);
+        return new FortniteAPIImpl(apiKey, language);
     }
 
 }

src/main/java/com/thoo/api/FortniteAPIImpl.java

@@ -1,6 +1,7 @@
 package com.thoo.api;
 
 import com.thoo.api.endpoints.*;
+import com.thoo.api.enums.Language;
 import com.thoo.api.utils.HttpUtils;
 
 public final class FortniteAPIImpl implements FortniteAPI {
@@ -13,14 +14,14 @@ public final class FortniteAPIImpl implements FortniteAPI {
     private ShopEndpoint shopEndpoint;
     private NewsEndpoint newsEndpoint;
 
-    public FortniteAPIImpl(String apiKey){
+    public FortniteAPIImpl(String apiKey, Language defaultLanguage){
         this.apiKey = apiKey;
         new HttpUtils(this);
         this.aesEndpoint = new AESEndpoint();
         this.creatorCodeEndpoint = new CreatorCodeEndpoint();
-        this.cosmeticEndpoint = new CosmeticEndpoint();
-        this.shopEndpoint = new ShopEndpoint();
-        this.newsEndpoint = new NewsEndpoint();
+        this.cosmeticEndpoint = new CosmeticEndpoint(defaultLanguage);
+        this.shopEndpoint = new ShopEndpoint(defaultLanguage);
+        this.newsEndpoint = new NewsEndpoint(defaultLanguage);
     }
 
     public String getApiKey() {

src/main/java/com/thoo/api/endpoints/AESEndpoint.java

@@ -1,30 +1,27 @@
 package com.thoo.api.endpoints;
 
+import com.thoo.api.model.AESKeyFormat;
 import com.thoo.api.model.AESModel;
 import com.thoo.api.model.BaseModel;
 import com.thoo.api.objects.FortniteResponse;
 import com.thoo.api.services.AESService;
 import com.thoo.api.utils.HttpUtils;
 import retrofit2.Call;
-import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
 
-public final class AESEndpoint {
-
-    private AESService service;
-    private Retrofit retrofit;
+public final class AESEndpoint extends Endpoint<AESService> {
 
     public AESEndpoint(){
-        this.retrofit = new Retrofit.Builder()
-                .addConverterFactory(GsonConverterFactory.create())
-                .baseUrl(AESService.BASE_URL)
-                .client(HttpUtils.client).build();
-        this.service = retrofit.create(AESService.class);
+        super(AESService.class);
     }
 
     public FortniteResponse<BaseModel<AESModel>> getAES() {
         Call<BaseModel<AESModel>> call = service.aes();
         return HttpUtils.parse(call);
     }
 
+    public FortniteResponse<BaseModel<AESModel>> getAES(AESKeyFormat format) {
+        Call<BaseModel<AESModel>> call = service.aes(format.toString().toLowerCase());
+        return HttpUtils.parse(call);
+    }
+
 }

src/main/java/com/thoo/api/endpoints/CosmeticEndpoint.java

@@ -12,28 +12,28 @@
 
 public final class CosmeticEndpoint extends Endpoint<CosmeticService> {
 
-    public CosmeticEndpoint(){
-        super(CosmeticService.class);
+    public CosmeticEndpoint(Language defaultLanguage){
+        super(CosmeticService.class, defaultLanguage);
     }
 
     public FortniteResponse<BaseModel<BrCosmetic[]>> getCosmetics(){
-        return HttpUtils.parse(service.getCosmetics());
+        return HttpUtils.parse(service.getCosmetics(defaultLanguage.code));
     }
 
     public FortniteResponse<BaseModel<BrCosmetic[]>> getCosmetics(Language language){
         return HttpUtils.parse(service.getCosmetics(language.code));
     }
 
     public FortniteResponse<BaseModel<BrCosmetic>> getCosmeticByID(String id){
-        return HttpUtils.parse(service.getCosmeticsByID(id));
+        return HttpUtils.parse(service.getCosmeticsByID(id, defaultLanguage.code));
     }
 
     public FortniteResponse<BaseModel<BrCosmetic>> getCosmeticByID(String id, Language language){
         return HttpUtils.parse(service.getCosmeticsByID(id, language.code));
     }
 
     public Optional<BrCosmetic> getCosmeticByName(String name){
-        return getCosmeticByName(name, Language.EN);
+        return getCosmeticByName(name, defaultLanguage);
     }
 
     public Optional<BrCosmetic> getCosmeticByName(String name, Language language){

src/main/java/com/thoo/api/endpoints/CreatorCodeEndpoint.java

@@ -6,20 +6,11 @@
 import com.thoo.api.services.CCService;
 import com.thoo.api.utils.HttpUtils;
 import retrofit2.Call;
-import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
 
-public final class CreatorCodeEndpoint {
-
-    private CCService service;
-    private Retrofit retrofit;
+public final class CreatorCodeEndpoint extends Endpoint<CCService> {
 
     public CreatorCodeEndpoint(){
-        this.retrofit = new Retrofit.Builder()
-                .addConverterFactory(GsonConverterFactory.create())
-                .baseUrl(CCService.BASE_URL)
-                .client(HttpUtils.client).build();
-        this.service = retrofit.create(CCService.class);
+        super(CCService.class);
     }
 
     public FortniteResponse<BaseModel<CreatorModel>> get(String slug){

src/main/java/com/thoo/api/endpoints/Endpoint.java

@@ -1,5 +1,6 @@
 package com.thoo.api.endpoints;
 
+import com.thoo.api.enums.Language;
 import com.thoo.api.utils.HttpUtils;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -8,13 +9,24 @@ public abstract class Endpoint<T> {
 
     protected final Retrofit retrofit;
     protected final T service;
+    protected final Language defaultLanguage;
+
+    public Endpoint(Class<? extends T> service, Language defaultLanguage){
+        this.retrofit = new Retrofit.Builder()
+                .addConverterFactory(GsonConverterFactory.create(HttpUtils.gson))
+                .baseUrl("https://fortnite-api.com/")
+                .client(HttpUtils.client).build();
+        this.service = retrofit.create(service);
+        this.defaultLanguage = defaultLanguage;
+    }
 
     public Endpoint(Class<? extends T> service){
         this.retrofit = new Retrofit.Builder()
                 .addConverterFactory(GsonConverterFactory.create(HttpUtils.gson))
                 .baseUrl("https://fortnite-api.com/")
                 .client(HttpUtils.client).build();
         this.service = retrofit.create(service);
+        this.defaultLanguage = Language.EN;
     }
 
 }

src/main/java/com/thoo/api/endpoints/NewsEndpoint.java

@@ -10,36 +10,36 @@
 
 public final class NewsEndpoint extends Endpoint<NewsService> {
 
-    public NewsEndpoint() {
-        super(NewsService.class);
+    public NewsEndpoint(Language defaultLanguage) {
+        super(NewsService.class, defaultLanguage);
     }
 
     public FortniteResponse<BaseModel<NewsCombined>> getNews(){
-        return HttpUtils.parse(service.getNews());
+        return getNews(defaultLanguage);
     }
 
     public FortniteResponse<BaseModel<NewsCombined>> getNews(Language language){
         return HttpUtils.parse(service.getNews(language.code));
     }
 
     public FortniteResponse<BaseModel<NewsTab>> getNewsBr(){
-        return HttpUtils.parse(service.getNewsBr());
+        return getNewsBr(defaultLanguage);
     }
 
     public FortniteResponse<BaseModel<NewsTab>> getNewsBr(Language language){
         return HttpUtils.parse(service.getNewsBr(language.code));
     }
 
     public FortniteResponse<BaseModel<NewsTab>> getNewsStw(){
-        return HttpUtils.parse(service.getNewsStw());
+        return getNewsStw(defaultLanguage);
     }
 
     public FortniteResponse<BaseModel<NewsTab>> getNewsStw(Language language){
         return HttpUtils.parse(service.getNewsStw(language.code));
     }
 
     public FortniteResponse<BaseModel<NewsTab>> getNewsCreative(){
-        return HttpUtils.parse(service.getNewsCreative());
+        return getNewsCreative(defaultLanguage);
     }
 
     public FortniteResponse<BaseModel<NewsTab>> getNewsCreative(Language language){

src/main/java/com/thoo/api/endpoints/ShopEndpoint.java

@@ -9,12 +9,12 @@
 
 public final class ShopEndpoint extends Endpoint<ShopService> {
 
-    public ShopEndpoint() {
-        super(ShopService.class);
+    public ShopEndpoint(Language defaultLanguage) {
+        super(ShopService.class, defaultLanguage);
     }
 
     public FortniteResponse<BaseModel<BrShop>> getShop(){
-        return HttpUtils.parse(service.shop());
+        return getShop(defaultLanguage);
     }
 
     public FortniteResponse<BaseModel<BrShop>> getShop(Language language){