V1.3.1 dev (#14)

* Removed exclude range

* Bumped version

* Updated pom version extract

* Added missing merchandise items
* Encyclopedia Eorzea
* Both Heavensward Lore books
* Both new carbuncle plushes

* Updated changelog and readme to reflect changes added

* Added Moogle Beast Tribe Mount

* Added Vanu Vanu beast tribe mount

* Added Vath beast tribe mount

* Update pom.xml

* [Bugfix] 180 days and 90 day subscriptions were returing wrong value

* [Bugfix] missing comma was causing db inserts to fail

* Added option to supress SSL verification warnings

* Updated changelog

Author: ReidWeb

CHANGELOG.md

@@ -1,3 +1,8 @@
+v1.3.1
+======
+* Resolved bug with mismatching number of column headers and values in SQL inserts
+* Added option to suppress SSL verification warnings - `-s`
+
 v1.3.0
 ======
 * Completely removed 30 second exclude range from image reader - it was excluding players that are active, and none of the players being excluded are inactive.

src/main/java/com/ffxivcensus/gatherer/Console.java

@@ -26,7 +26,7 @@ public static GathererController run(String [] args){
         Options options = setupOptions();
 
         //Declare usage string
-        String usage = "java -jar XIVStats-Gatherer-Java.jar [-abmqvxDFPS] -s startid -f finishid [-d database-name] [-u database-user] [-p database-user-password] [-U database-url] [-T table] [-t threads]";
+        String usage = "java -jar XIVStats-Gatherer-Java.jar [-abimqvxDFPS] -s startid -f finishid [-d database-name] [-u database-user] [-p database-user-password] [-U database-url] [-T table] [-t threads]";
         HelpFormatter formatter = new HelpFormatter();
 
         try{
@@ -85,6 +85,8 @@ public static GathererController run(String [] args){
                 gatherer.setDbPassword(cmd.getOptionValue("p"));
             }
 
+            gatherer.setDbIgnoreSSLWarn(cmd.hasOption("i"));
+
             //Program threads
             if(cmd.hasOption("t")){
                 gatherer.setThreadLimit(Integer.parseInt(cmd.getOptionValue("t")));
@@ -151,6 +153,7 @@ public static Options setupOptions(){
         Option optSuffix = Option.builder("x").longOpt("suffix").hasArg().numberOfArgs(1).argName("table-suffix").desc("suffix to append to all tables").build();
         Option optStoreActive = Option.builder("a").longOpt("do-not-store-activity").desc("do not store boolean data indicating player activity in last 30 days").build();
         Option optStoreDate = Option.builder("D").longOpt("do-not-store-date").desc("do not store Date of last player activity").build();
+        Option optIgnoreSSLVerify = Option.builder("i").longOpt("ignore-ssl-verification").desc("Supress/ignore MySQL SSL verification warnings").build();
 
         //Add each option to the options object
         options.addOption(optStart);
@@ -172,6 +175,7 @@ public static Options setupOptions(){
         options.addOption(optSuffix);
         options.addOption(optStoreActive);
         options.addOption(optStoreDate);
+        options.addOption(optIgnoreSSLVerify);
 
         return options;
     }

src/main/java/com/ffxivcensus/gatherer/GathererController.java

@@ -39,6 +39,10 @@ public class GathererController {
      * The password for the user, to use.
      */
     private String dbPassword;
+    /**
+     * Whether to ignore database SSL verification warnings
+     */
+    private boolean dbIgnoreSSLWarn;
     /**
      * The character ID to start the gatherer at.
      */
@@ -183,6 +187,9 @@ public GathererController(int startId, int endId, boolean quiet, boolean verbose
 
         //Parameters specified should outweigh config
         this.dbUrl = "jdbc:" + dbUrl + "/" + dbName;
+        if (this.dbIgnoreSSLWarn) {
+            this.dbUrl += "?useSSL=false";
+        }
         this.dbUser = dbUser;
         this.dbPassword = dbPassword;
         this.threadLimit = threads;
@@ -347,7 +354,7 @@ private void createTable(String tableName) {
                 sbSQL.append("soundtrack BIT,saweternalbond BIT,sightseeing BIT,comm50 BIT,moogleplush BIT,");
                 sbSQL.append("topazcarubuncleplush BIT,emeraldcarbuncleplush BIT,");
                 sbSQL.append("hildibrand BIT, dideternalbond BIT, arrcollector BIT,");
-                sbSQL.append("kobold BIT, sahagin BIT, amaljaa BIT, sylph BIT, moogle BIT, vanuvanu BIT, vath BIT, ");
+                sbSQL.append("kobold BIT, sahagin BIT, amaljaa BIT, sylph BIT,");
                 sbSQL.append("arr_25_complete BIT,hw_complete BIT, hw_31_complete BIT, hw_33_complete BIT, legacy_player BIT");
             }
             if (this.storeMounts) {
@@ -497,7 +504,7 @@ protected String writeToDB(Player player) {
                         + player.getBitHas960DaysSub() + ",");
 
                 sbFields.append("prearr, prehw, arrartbook, hwartbookone, hwartbooktwo, hasencyclopedia, beforemeteor, beforethefall, soundtrack, saweternalbond, "
-                                + "sightseeing, arr_25_complete, comm50, moogleplush, topazcarubuncleplush, emeraldcarbuncleplush");
+                                + "sightseeing, arr_25_complete, comm50, moogleplush, topazcarubuncleplush, emeraldcarbuncleplush,");
                 sbValues.append(player.getBitHasPreOrderArr() + "," + player.getBitHasPreOrderHW() + ","
                                 + player.getBitHasArrArtbook() + "," + player.getBitHasHWArtbookOne() + ","
                                 + player.getBitHasHWArtbookTwo() + "," + player.getBitHasEncyclopediaEorzea() + ","
@@ -846,4 +853,12 @@ public void setStoreActiveDate(boolean storeActiveDate) {
     public void setStorePlayerActive(boolean storePlayerActive) {
         this.storePlayerActive = storePlayerActive;
     }
+
+    /**
+     * Set whether to ignore database ssl verification warnings
+     * @param dbIgnoreSSLWarn whether to ignore database ssl verification warnings
+     */
+    public void setDbIgnoreSSLWarn(boolean dbIgnoreSSLWarn) {
+        this.dbIgnoreSSLWarn = dbIgnoreSSLWarn;
+    }
 }

src/test/java/com/ffxivcensus/gatherer/ConsoleTest.java

@@ -119,7 +119,7 @@ public void cleanUpStreams() {
     @Test
     public void testConsole() throws Exception {
 
-        String[] args = {"-s", "0", "-f", "100", "-t", "10", "-T", "tblplayers_test", "-d", dbName,"-U",dbHost, "-bPq"};
+        String[] args = {"-is", "0", "-f", "100", "-t", "10", "-T", "tblplayers_test", "-d", dbName,"-U",dbHost, "-bPq"};
 
         GathererController gc = Console.run(args);
         //Test that options have set attributes correctly
@@ -168,7 +168,7 @@ public void testConsoleFullOptions() throws Exception {
     @Test
     public void TestConsoleHelpDefault() throws Exception {
 
-        String strHelp = "usage: java -jar XIVStats-Gatherer-Java.jar [-abmqvxDFPS] -s startid -f";
+        String strHelp = "usage: java -jar XIVStats-Gatherer-Java.jar [-abimqvxDFPS] -s startid -f";
 
         //Test for a help dialog displayed upon failure
         String[] args = {""};
@@ -180,7 +180,7 @@ public void TestConsoleHelpDefault() throws Exception {
     @Test
     public void TestConsoleHelpOnFail() throws Exception {
 
-        String strHelp = "usage: java -jar XIVStats-Gatherer-Java.jar [-abmqvxDFPS] -s startid -f";
+        String strHelp = "usage: java -jar XIVStats-Gatherer-Java.jar [-abimqvxDFPS] -s startid -f";
         //Test for a help dialog displayed upon failure
         String[] args = {"-s 0"};
         GathererController gc = Console.run(args);
@@ -192,7 +192,7 @@ public void TestConsoleHelpOnFail() throws Exception {
     @Test
     public void TestConsoleHelp() throws Exception {
 
-        String strHelp = "usage: java -jar XIVStats-Gatherer-Java.jar [-abmqvxDFPS] -s startid -f";
+        String strHelp = "usage: java -jar XIVStats-Gatherer-Java.jar [-abimqvxDFPS] -s startid -f";
 
         //First test for a user requested help dialog
         String[] args = {"--help"};