Refactoring of Steam Module

MikeFot · MikeFot · commit 9ecab0cd12fd · 2017-03-18T16:18:17.000Z
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/Library.java b/steam/src/main/java/com/michaelfotiadis/steam/model/Library.java
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/SteamApiModel.java b/steam/src/main/java/com/michaelfotiadis/steam/model/SteamApiModel.java
@@ -0,0 +1,5 @@
+package com.michaelfotiadis.steam.model;
+
+public interface SteamApiModel {
+    // Marker Interface
+}
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/User.java b/steam/src/main/java/com/michaelfotiadis/steam/model/User.java
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/VanityResponse.java b/steam/src/main/java/com/michaelfotiadis/steam/model/VanityResponse.java
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/api/AccountDetails.java b/steam/src/main/java/com/michaelfotiadis/steam/model/api/AccountDetails.java
@@ -1,12 +1,12 @@
-package com.michaelfotiadis.steam.model;
+package com.michaelfotiadis.steam.model.api;
 
 
-import com.michaelfotiadis.steam.dota2.model.api.DotaApiModel;
+import com.michaelfotiadis.steam.model.SteamApiModel;
 
 /**
  *
  */
-public interface AccountDetails extends DotaApiModel {
+public interface AccountDetails extends SteamApiModel {
     String getSteamId();
 
     String getAvatar();
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/api/AccountDetailsImpl.java b/steam/src/main/java/com/michaelfotiadis/steam/model/api/AccountDetailsImpl.java
@@ -1,4 +1,4 @@
-package com.michaelfotiadis.steam.model;
+package com.michaelfotiadis.steam.model.api;
 
 
 import com.google.gson.annotations.SerializedName;
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/api/Game.java b/steam/src/main/java/com/michaelfotiadis/steam/model/api/Game.java
@@ -1,12 +1,12 @@
-package com.michaelfotiadis.steam.model;
+package com.michaelfotiadis.steam.model.api;
 
 
-import com.michaelfotiadis.steam.dota2.model.api.DotaApiModel;
+import com.michaelfotiadis.steam.model.SteamApiModel;
 
 /**
  *
  */
-public interface Game extends DotaApiModel {
+public interface Game extends SteamApiModel {
 
     Long getAppId();
 
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/api/GameImpl.java b/steam/src/main/java/com/michaelfotiadis/steam/model/api/GameImpl.java
@@ -1,4 +1,4 @@
-package com.michaelfotiadis.steam.model;
+package com.michaelfotiadis.steam.model.api;
 
 
 import com.google.gson.annotations.SerializedName;
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/api/Library.java b/steam/src/main/java/com/michaelfotiadis/steam/model/api/Library.java
@@ -0,0 +1,15 @@
+package com.michaelfotiadis.steam.model.api;
+
+
+import com.michaelfotiadis.steam.model.SteamApiModel;
+
+import java.util.List;
+
+/**
+ *
+ */
+public interface Library extends SteamApiModel {
+    Integer getGameCount();
+
+    List<Game> getGames();
+}
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/api/LibraryImpl.java b/steam/src/main/java/com/michaelfotiadis/steam/model/api/LibraryImpl.java
@@ -1,4 +1,4 @@
-package com.michaelfotiadis.steam.model;
+package com.michaelfotiadis.steam.model.api;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/api/User.java b/steam/src/main/java/com/michaelfotiadis/steam/model/api/User.java
@@ -0,0 +1,15 @@
+package com.michaelfotiadis.steam.model.api;
+
+
+import com.michaelfotiadis.steam.model.SteamApiModel;
+
+/**
+ *
+ */
+public interface User extends SteamApiModel {
+
+    AccountDetails getAccountDetails();
+
+    Library getGameLibrary();
+
+}
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/api/UserImpl.java b/steam/src/main/java/com/michaelfotiadis/steam/model/api/UserImpl.java
@@ -1,4 +1,4 @@
-package com.michaelfotiadis.steam.model;
+package com.michaelfotiadis.steam.model.api;
 
 
 /**
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/api/VanityResponse.java b/steam/src/main/java/com/michaelfotiadis/steam/model/api/VanityResponse.java
@@ -0,0 +1,15 @@
+package com.michaelfotiadis.steam.model.api;
+
+
+import com.michaelfotiadis.steam.model.SteamApiModel;
+
+/**
+ *
+ */
+public interface VanityResponse extends SteamApiModel {
+    String getSteamid();
+
+    Integer getSuccess();
+
+    String getMessage();
+}
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/api/VanityResponseImpl.java b/steam/src/main/java/com/michaelfotiadis/steam/model/api/VanityResponseImpl.java
@@ -1,4 +1,4 @@
-package com.michaelfotiadis.steam.model;
+package com.michaelfotiadis.steam.model.api;
 
 
 import com.google.gson.annotations.SerializedName;
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/response/LibraryResponse.java b/steam/src/main/java/com/michaelfotiadis/steam/model/response/LibraryResponse.java
@@ -1,7 +1,7 @@
 package com.michaelfotiadis.steam.model.response;
 
 import com.google.gson.annotations.SerializedName;
-import com.michaelfotiadis.steam.model.Library;
+import com.michaelfotiadis.steam.model.api.Library;
 
 public class LibraryResponse {
     @SerializedName("response")
diff --git a/steam/src/main/java/com/michaelfotiadis/steam/model/response/PlayerResponse.java b/steam/src/main/java/com/michaelfotiadis/steam/model/response/PlayerResponse.java
@@ -1,7 +1,7 @@
 package com.michaelfotiadis.steam.model.response;
 
 import com.google.gson.annotations.SerializedName;
-import com.michaelfotiadis.steam.model.AccountDetails;
+import com.michaelfotiadis.steam.model.api.AccountDetails;
 
 import java.util.List;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.michaelfotiadis.steam.model;`
	`1`	`+package com.michaelfotiadis.steam.model.api;`
`2`	`2`
`3`	`3`
`4`	`4`	`import com.google.gson.annotations.SerializedName;`