small modification to mtgegalities, marked some fileds as transient t…

…o prevent serialization
MickHardins · Apr 27, 2017 · df9ac60 · df9ac60
1 parent 02be6e8
commit df9ac60
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 24 deletions.
diff --git a/src/main/java/com/mickhardins/DatabaseFiller/ApplicationController.java b/src/main/java/com/mickhardins/DatabaseFiller/ApplicationController.java
@@ -118,7 +118,7 @@ public static UpdateObject createUpdateObject(ChangelogAnalyzer changelogAnalyze
     public static void main (String[] args) throws IOException,SQLException {
 
         Utils.init();
-        Utils.downloadInputFilesFromMtgjson(INPUT_JSON_DIR);
+        //Utils.downloadInputFilesFromMtgjson(INPUT_JSON_DIR);
         Deserializer deserializer = new Deserializer();
         CardProcesser cardProcesser = new CardProcesser();
 
@@ -150,7 +150,7 @@ public static void main (String[] args) throws IOException,SQLException {
 
         String[] setCodes = deserializer.deserializeMTGSetCodes(INPUT_JSON_DIR + Utils.SETCODES_FILENAME);
         String[] setCodesUrls = Utils.generateSetCodesUrls(setCodes);
-        deserializer.serializeSetCodesURLs(setCodes, OUTPUT_DIR);
+        deserializer.serializeSetCodesURLs(setCodesUrls, OUTPUT_DIR);
         System.out.println("LOG:\tDeserializzazione setCodes completata");
 
         // ~~~~~~~~~-~~~~~~~~~~~~~~~~~~-~~~~~~~~~~~~~~~~~~-~~~~~~~~~~~~~~~~~~-~~~~~~~~~~~-~~~~~~~~~

diff --git a/src/main/java/com/mickhardins/DatabaseFiller/model/MTGArtist.java b/src/main/java/com/mickhardins/DatabaseFiller/model/MTGArtist.java
@@ -4,14 +4,19 @@
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+
 /**
  * Created by Mick on 21/12/2014.
  */
 @DatabaseTable(tableName = "Artists")
 public class MTGArtist
 {
     @DatabaseField(generatedId = true)
-    transient private long id;
+    private String id;
 
     @DatabaseField()
     @SerializedName("a")
@@ -31,14 +36,10 @@ public MTGArtist(String name){
 
     }
 
-    public long getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(long id) {
-        this.id = id;
-    }
-
     public String getName() {
         return name;
     }
@@ -64,4 +65,22 @@ public boolean equals(Object o) {
     public int hashCode() {
         return name.hashCode();
     }
+
+    public void calculateID() {
+        try {
+
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ObjectOutputStream oos = new ObjectOutputStream(baos);
+            oos.writeObject(this);
+            oos.close();
+
+            MessageDigest m = MessageDigest.getInstance("SHA1");
+            m.update(baos.toByteArray());
+
+            id =  new BigInteger(1, m.digest()).toString(16);
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/src/main/java/com/mickhardins/DatabaseFiller/model/MTGCard.java b/src/main/java/com/mickhardins/DatabaseFiller/model/MTGCard.java
@@ -13,8 +13,8 @@
 public class MTGCard
 {
 
-    @DatabaseField(generatedId = true)
-    transient private Long id;
+    @SerializedName("a2")
+    transient private String id;
 
     @DatabaseField()
     @SerializedName("a")

diff --git a/src/main/java/com/mickhardins/DatabaseFiller/model/MTGCardLegalities.java b/src/main/java/com/mickhardins/DatabaseFiller/model/MTGCardLegalities.java
@@ -6,23 +6,25 @@
 
 /**
  * Created by Mick on 19/12/2014.
+ *
+ * field marked as transient will not be serialized by Gson
  */
 
 @DatabaseTable(tableName = "Legalities")
 public class MTGCardLegalities
 {
     @DatabaseField(generatedId = true)
-     transient private Long id;
+    transient private Long id; //transient is for Gson field exclusion
+
 
-    @DatabaseField()
     @SerializedName("a")
     private String standard;
 
-    @DatabaseField
+
     @SerializedName("b")
     private String modern;
 
-    @DatabaseField
+
     @SerializedName("c")
     private String block;
 
@@ -36,31 +38,31 @@ public class MTGCardLegalities
 
     @DatabaseField
     @SerializedName("f")
-    private String freeform;
+    transient private String freeform;
 
     @DatabaseField
     @SerializedName("g")
-    private String prismatic;
+    transient private String prismatic;
 
     @DatabaseField
     @SerializedName("h")
-    private String tribal_wars_legacy;
+    transient private String tribal_wars_legacy;
 
     @DatabaseField
     @SerializedName("i")
-    private String tribal_wars_standard;
+    transient private String tribal_wars_standard;
 
     @DatabaseField
     @SerializedName("j")
-    private String singleton100;
+    transient private String singleton100;
 
     @DatabaseField
     @SerializedName("k")
     private String commander;
 
     @DatabaseField()
     @SerializedName("l")
-    private String pauper;
+    transient private String pauper;
 
     public MTGCardLegalities()
     {

diff --git a/src/main/java/com/mickhardins/DatabaseFiller/model/MTGColors.java b/src/main/java/com/mickhardins/DatabaseFiller/model/MTGColors.java
@@ -61,13 +61,11 @@ public class MTGColors
 
 
 
-    public MTGColors()
-    {
+    public MTGColors() {
 
     }
 
-    public static int colorID(DeserializedMTGCard card)
-    {
+    public static int colorID(DeserializedMTGCard card) {
         int id = 0;
         if(card.getColors()== null) return id;
         if(card.getColors().contains("Black"))  id = id | BLACK_FLAG;