From df9ac60e9c3a8e939754a166bce5f9883b834657 Mon Sep 17 00:00:00 2001 From: MickHardins Date: Thu, 27 Apr 2017 18:46:23 +0200 Subject: [PATCH] small modification to mtgegalities, marked some fileds as transient to prevent serialization --- .../DatabaseFiller/ApplicationController.java | 4 +-- .../DatabaseFiller/model/MTGArtist.java | 31 +++++++++++++++---- .../DatabaseFiller/model/MTGCard.java | 4 +-- .../model/MTGCardLegalities.java | 22 +++++++------ .../DatabaseFiller/model/MTGColors.java | 6 ++-- 5 files changed, 43 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/mickhardins/DatabaseFiller/ApplicationController.java b/src/main/java/com/mickhardins/DatabaseFiller/ApplicationController.java index 67bf012..bc9df18 100644 --- 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 index fe85390..a6e76c2 100644 --- a/src/main/java/com/mickhardins/DatabaseFiller/model/MTGArtist.java +++ b/src/main/java/com/mickhardins/DatabaseFiller/model/MTGArtist.java @@ -4,6 +4,11 @@ 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. */ @@ -11,7 +16,7 @@ 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 index dffae55..cabc879 100644 --- 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 index 3d068ca..1de1533 100644 --- 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,23 +38,23 @@ 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") @@ -60,7 +62,7 @@ public class MTGCardLegalities @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 index bb783ad..1affa01 100644 --- 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;