Custom attribuet names in rest

Author: davidbilik

rest-fetcher/src/main/java/com/ackee/versionupdatehandler/RestVersionFetcher.java

@@ -6,6 +6,7 @@
 import com.ackee.versioupdatehandler.model.VersionsConfiguration;
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
 
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
@@ -16,6 +17,8 @@
 import rx.Single;
 import rx.functions.Func1;
 
+import static com.ackee.versionupdatehandler.RestVersionFetcher.ApiDescription.api;
+
 /**
  * Class that fetches version configuration from rest api
  * <p>
@@ -26,28 +29,40 @@
  **/
 public class RestVersionFetcher implements VersionFetcher {
     public static final String TAG = RestVersionFetcher.class.getName();
-    private ApiDescription api = null;
 
     interface ApiDescription {
         @GET("app_version")
-        public Single<BasicVersionsConfiguration> getVersions();
+        public Single<JsonObject> getVersions();
     }
 
+    public static final String MINIMAL_VERSION = "minimal_version_android";
+    public static final String CURRENT_VERSION = "current_version_android";
+
+    String minimalAttributeName;
+    String currentAttributeName;
     String baseUrl;
 
+    private ApiDescription api = null;
+
     public RestVersionFetcher(String baseUrl) {
+        this(baseUrl, MINIMAL_VERSION, CURRENT_VERSION);
+    }
+
+    public RestVersionFetcher(String baseUrl, String currentAttributeName, String minimalAttributeName) {
         this.baseUrl = baseUrl;
+        this.currentAttributeName = currentAttributeName;
+        this.minimalAttributeName = minimalAttributeName;
     }
 
     @Override
     public Single<VersionsConfiguration> fetch() {
         return getApi()
                 .getVersions()
                 // Single<BasicVersionsConfiguration> is not subtype of Single<VersionsConfiguration> :(
-                .map(new Func1<BasicVersionsConfiguration, VersionsConfiguration>() {
+                .map(new Func1<JsonObject, VersionsConfiguration>() {
                     @Override
-                    public VersionsConfiguration call(BasicVersionsConfiguration basicVersionsConfiguration) {
-                        return basicVersionsConfiguration;
+                    public VersionsConfiguration call(JsonObject json) {
+                        return new BasicVersionsConfiguration(json.get(minimalAttributeName).getAsLong(), json.get(currentAttributeName).getAsLong());
                     }
                 })
                 .onErrorResumeNext(new Func1<Throwable, Single<? extends VersionsConfiguration>>() {