make product and shop parcelable

Author: ajungg

CHANGELOG.md

@@ -16,6 +16,8 @@ the new class ProductResolver
 - Add support for online payment using SEPA
 - Add support for zebra hardware scanner devices
 - Add firebase barcode detector module
+- Product and Shop are now Parcelable
+- Added toShortString in Product and Shop
 
 ### Fixed
 - Properly cleanup okhttp connections on error responses

core/src/main/java/io/snabble/sdk/Product.java

@@ -1,16 +1,26 @@
 package io.snabble.sdk;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.InstanceCreator;
 import com.google.gson.annotations.SerializedName;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+import io.snabble.sdk.utils.GsonHolder;
+
 /**
  * Class that holds all of the product information.
  */
-public class Product {
+public class Product implements Serializable, Parcelable {
     public enum Type {
         /**
          * A basic product with price information.
@@ -107,6 +117,10 @@ public static SaleRestriction fromDatabaseField(long dbType, long value) {
     private Map<String, String> transmissionCodes;
     private boolean saleStop;
 
+    public Product() {
+
+    }
+
     /**
      * @return The unique identifier of the product. Usually the same identifier
      * the retailer uses internally.
@@ -254,14 +268,68 @@ public int hashCode() {
         return sku.hashCode();
     }
 
+    public String toShortString() {
+        return "Product{" +
+                "sku='" + sku + '\'' +
+                ", name='" + name + '\'' +
+                '}';
+    }
+
     @Override
     public String toString() {
         return "Product{" +
                 "sku='" + sku + '\'' +
                 ", name='" + name + '\'' +
+                ", description='" + description + '\'' +
+                ", scannableCodes=" + Arrays.toString(scannableCodes) +
+                ", weighedItemIds=" + Arrays.toString(weighedItemIds) +
+                ", price=" + price +
+                ", discountedPrice=" + discountedPrice +
+                ", imageUrl='" + imageUrl + '\'' +
+                ", depositProduct=" + depositProduct +
+                ", bundleProducts=" + Arrays.toString(bundleProducts) +
+                ", type=" + type +
+                ", isDeposit=" + isDeposit +
+                ", boost=" + boost +
+                ", subtitle='" + subtitle + '\'' +
+                ", basePrice='" + basePrice + '\'' +
+                ", saleRestriction=" + saleRestriction +
+                ", transmissionCodes=" + transmissionCodes +
+                ", saleStop=" + saleStop +
                 '}';
     }
 
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(GsonHolder.get().toJson(this));
+    }
+
+    protected Product(Parcel in) {
+        InstanceCreator<Product> creator = new InstanceCreator<Product>() {
+            public Product createInstance(java.lang.reflect.Type type) { return Product.this; }
+        };
+
+        Gson gson = new GsonBuilder().registerTypeAdapter(Product.class, creator).create();
+        gson.fromJson(in.readString(), Product.class);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    public static final Creator<Product> CREATOR = new Creator<Product>() {
+        @Override
+        public Product createFromParcel(Parcel in) {
+            return new Product(in);
+        }
+
+        @Override
+        public Product[] newArray(int size) {
+            return new Product[size];
+        }
+    };
+
     public static class Builder {
         private Product product = new Product();
 

core/src/main/java/io/snabble/sdk/Shop.java

@@ -1,15 +1,23 @@
 package io.snabble.sdk;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.InstanceCreator;
 import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import java.lang.reflect.Type;
+import java.util.Arrays;
 import java.util.Map;
 
 import io.snabble.sdk.utils.GsonHolder;
 import io.snabble.sdk.utils.Logger;
 
-public class Shop implements Serializable {
+public class Shop implements Serializable, Parcelable {
     public enum Service {
         @SerializedName("euro")
         EURO_PAYMENT,
@@ -29,6 +37,13 @@ public enum Service {
 
     public class Href {
         public String href;
+
+        @Override
+        public String toString() {
+            return "Href{" +
+                    "href='" + href + '\'' +
+                    '}';
+        }
     }
 
     public class OpeningHourSpecification {
@@ -47,6 +62,15 @@ public String getOpens() {
         public String getDayOfWeek() {
             return dayOfWeek;
         }
+
+        @Override
+        public String toString() {
+            return "OpeningHourSpecification{" +
+                    "closes='" + closes + '\'' +
+                    ", opens='" + opens + '\'' +
+                    ", dayOfWeek='" + dayOfWeek + '\'' +
+                    '}';
+        }
     }
 
     private String id;
@@ -68,6 +92,10 @@ public String getDayOfWeek() {
     private OpeningHourSpecification[] openingHoursSpecification;
     private JsonElement external;
 
+    public Shop() {
+
+    }
+
     public String getId() {
         return id;
     }
@@ -137,107 +165,78 @@ static Shop[] fromJson(JsonElement json) {
         }
     }
 
-    public static class Builder {
-        private String id;
-        private String externalId;
-        private String name;
-        private Shop.Service[] services;
-        private String street;
-        private String zipCode;
-        private String city;
-        private String country;
-        private String state;
-        private String phone;
-        private double latitude;
-        private double longitude;
-        private OpeningHourSpecification[] openingHoursSpecification;
-        private JsonElement external;
-
-        public Builder id(String id) {
-            this.id = id;
-            return this;
-        }
-
-        public Builder name(String name) {
-            this.name = name;
-            return this;
-        }
-
-        public Builder services(Shop.Service[] services) {
-            this.services = services;
-            return this;
-        }
+    @Override
+    public int hashCode() {
+        return id.hashCode();
+    }
 
-        public Builder street(String street) {
-            this.street = street;
-            return this;
-        }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
 
-        public Builder zipCode(String zipCode) {
-            this.zipCode = zipCode;
-            return this;
-        }
+        Shop shop = (Shop) o;
 
-        public Builder city(String city) {
-            this.city = city;
-            return this;
-        }
+        return id.equals(shop.id);
+    }
 
-        public Builder country(String country) {
-            this.country = country;
-            return this;
-        }
+    public String toShortString() {
+        return "Shop{" +
+                "id='" + id + '\'' +
+                ", name='" + name + '\'' +
+                '}';
+    }
 
-        public Builder state(String state) {
-            this.state = state;
-            return this;
-        }
+    @Override
+    public String toString() {
+        return "Shop{" +
+                "id='" + id + '\'' +
+                ", externalId='" + externalId + '\'' +
+                ", name='" + name + '\'' +
+                ", services=" + Arrays.toString(services) +
+                ", street='" + street + '\'' +
+                ", zipCode='" + zipCode + '\'' +
+                ", city='" + city + '\'' +
+                ", country='" + country + '\'' +
+                ", state='" + state + '\'' +
+                ", phone='" + phone + '\'' +
+                ", links=" + links +
+                ", latitude=" + latitude +
+                ", longitude=" + longitude +
+                ", openingHoursSpecification=" + Arrays.toString(openingHoursSpecification) +
+                ", external=" + external +
+                '}';
+    }
 
-        public Builder phone(String phone) {
-            this.phone = phone;
-            return this;
-        }
+    @Override
+    public int describeContents() {
+        return 0;
+    }
 
-        public Builder latLng(double latitude, double longitude) {
-            this.latitude = latitude;
-            this.longitude = longitude;
-            return this;
-        }
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        String str = GsonHolder.get().toJson(this);
+        dest.writeString(str);
+    }
 
-        public Builder openingHours(OpeningHourSpecification[] openingHours) {
-            this.openingHoursSpecification = openingHours;
-            return this;
-        }
+    protected Shop(Parcel in) {
+        InstanceCreator<Shop> creator = new InstanceCreator<Shop>() {
+            public Shop createInstance(Type type) { return Shop.this; }
+        };
 
-        public Builder externalId(String externalId) {
-            this.externalId = externalId;
-            return this;
-        }
+        Gson gson = new GsonBuilder().registerTypeAdapter(Shop.class, creator).create();
+        gson.fromJson(in.readString(), Shop.class);
+    }
 
-        public Builder external(JsonElement external) {
-            this.external = external;
-            return this;
+    public static final Parcelable.Creator<Shop> CREATOR = new Parcelable.Creator<Shop>() {
+        @Override
+        public Shop createFromParcel(Parcel source) {
+            return new Shop(source);
         }
 
-        public Shop create() {
-            Shop shop = new Shop();
-
-            shop.id = id;
-            shop.externalId = externalId;
-            shop.name = name;
-            shop.services = services;
-            shop.street = street;
-            shop.zipCode = zipCode;
-            shop.city = city;
-            shop.country = country;
-            shop.state = state;
-            shop.phone = phone;
-            shop.latitude = latitude;
-            shop.longitude = longitude;
-            shop.openingHoursSpecification = openingHoursSpecification;
-            shop.external = external;
-
-            return shop;
+        @Override
+        public Shop[] newArray(int size) {
+            return new Shop[size];
         }
-    }
+    };
 }

sample/src/main/java/io/snabble/testapp/App.java

@@ -84,15 +84,17 @@ public void init(final InitCallback callback) {
             public void onReady() {
                 project = snabble.getProjects().get(0);
 
-                // registers this sdk instance globally for use with ui components
+                // registers this project globally for use with ui components
                 SnabbleUI.useProject(project);
 
                 // select the first shop for demo purposes
                 if (project.getShops().length > 0) {
                     project.setCheckedInShop(project.getShops()[0]);
                 }
 
-                //project.getProductDatabase().update();
+                // you can update the local database asynchronously, you can still query
+                // the database while this is running
+                // project.getProductDatabase().update();
 
                 // optionally set a loyalty card id for identification, for demo purposes
                 // we invent one here