Merge branch 'release/v0.2.3'

GooBox · Jun 29, 2018 · b1dfd13 · b1dfd13
2 parents a653428 + c2d5253
commit b1dfd13
Show file tree

Hide file tree

Showing 117 changed files with 2,183 additions and 1,119 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.2
+current_version = 0.2.3
 commit = True
 tag = False
 

diff --git a/.swagger-codegen-ignore b/.swagger-codegen-ignore
@@ -0,0 +1,29 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this name to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this name by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, name or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, name or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the name extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single name:
+#!docs/README.md
+
+.gitignore
+.travis.yml
+pom.xml
+
+*.gradle
diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
@@ -0,0 +1 @@
+unset
diff --git a/.travis.yml b/.travis.yml
@@ -8,22 +8,28 @@ after_success:
 - gradle jacocoTestReport coveralls
 before_deploy:
 - mkdir -p build/sia
-- curl -Ls https://github.com/NebulousLabs/Sia/releases/download/v$SIA_VERSION/Sia-v$SIA_VERSION-darwin-amd64.zip -o build/sia/Sia-v$SIA_VERSION-darwin-amd64.zip
-- curl -Ls https://github.com/NebulousLabs/Sia/releases/download/v$SIA_VERSION/Sia-v$SIA_VERSION-linux-amd64.zip -o build/sia/Sia-v$SIA_VERSION-linux-amd64.zip
-- curl -Ls https://github.com/NebulousLabs/Sia/releases/download/v$SIA_VERSION/Sia-v$SIA_VERSION-windows-amd64.zip -o build/sia/Sia-v$SIA_VERSION-windows-amd64.zip
-- (cd build/sia && unzip Sia-v$SIA_VERSION-darwin-amd64.zip)
-- (cd build/sia && unzip Sia-v$SIA_VERSION-linux-amd64.zip)
-- (cd build/sia && unzip Sia-v$SIA_VERSION-windows-amd64.zip)
+- curl -Ls https://github.com/NebulousLabs/Sia/releases/download/v$SIA_VERSION/Sia-v$SIA_VERSION-darwin-amd64.zip
+  -o build/sia/Sia-v$SIA_VERSION-darwin-amd64.zip
+- curl -Ls https://github.com/NebulousLabs/Sia/releases/download/v$SIA_VERSION/Sia-v$SIA_VERSION-linux-amd64.zip
+  -o build/sia/Sia-v$SIA_VERSION-linux-amd64.zip
+- curl -Ls https://github.com/NebulousLabs/Sia/releases/download/v$SIA_VERSION/Sia-v$SIA_VERSION-windows-amd64.zip
+  -o build/sia/Sia-v$SIA_VERSION-windows-amd64.zip
+- "(cd build/sia && unzip Sia-v$SIA_VERSION-darwin-amd64.zip)"
+- "(cd build/sia && unzip Sia-v$SIA_VERSION-linux-amd64.zip)"
+- "(cd build/sia && unzip Sia-v$SIA_VERSION-windows-amd64.zip)"
 - gradle distTar -x sia-linux -x sia-mac -x sia-win64
 deploy:
   provider: releases
   api_key:
     secure: bu664xqdPaj+6JomOZJ7ivzIaDrGZXySCApcAYO7AIwBY0KlkbFO/zY/kYb7XRu7DfNYqDM9i2gGsdqneTDlvjg8NmxkpviKjrPMG8Fp8sjQK544ae4kpptMFc9d0eC+z5lv1WjrK9Jzq7Mnv0SKAcdtGguoGkUN1xE3PqK3wmvz7xKSAWSZZM3e5lw9AbBgShQTBfAV3qkE06Ga34Al72mqJ7BS3ZscxnJiLMW+jhlAGE+t+GybE53+QLgMJje2RU6gRJagi+IIem93uQuGAdZ6+eYrd4yqxEQyZpBIQz9kJs6P+WqC4yk46cmEBUZEYA/U8vxPOd7e8UawtOSfBMODvJKLAZoB/GKWXm9u0i0C906DEBZPSMMTVe3Pq1pO4smqiv8aC5cTCxsM3MXqsl1yssnhFX/HDJgu+QAqEoXmXNLUF4OV/1tIdveJXXjvGHOGUhTbC65d0qHA7alSUhql/IQ9Ha7QtSMFKVf3Re8U2IWr9VYfOhgGDw9e3cdARkDwZo+xk7moIfr4XGUMpOWRowZ+i0jZK2rE720T6TvsTjW95G9lXiUkViVex+vbiv/CwXak/msG5P/mkPxu8DACRltdquqAyyVZTZL94HOaL8Ra4g8GjyNOWmQujv4GgPltd0ZjCoEZh6IQ/qiyozRtonLgEwRMNzs7+wz5JOE=
   skip_cleanup: true
   file:
-  - build/distributions/goobox-sync-sia-0.2.2-linux.tar.gz
-  - build/distributions/goobox-sync-sia-0.2.2-mac.tar.gz
-  - build/distributions/goobox-sync-sia-0.2.2-win64.tar.gz
+  - build/distributions/goobox-sync-sia-0.2.3-linux.tar.gz
+  - build/distributions/goobox-sync-sia-0.2.3-mac.tar.gz
+  - build/distributions/goobox-sync-sia-0.2.3-win64.tar.gz
   on:
     tags: true
     repo: GooBox/goobox-sync-sia
+notifications:
+  slack:
+    secure: V8R+rm4EQaD8ph6efPLxFe6AscdvVLoo/fo9P2qrT32UGxCUPjKOXB2E5D73PEA1iuXShNqZmnqSG2N/t7Gf/JhKGfknwhxMCAWUV+ODb7VuEoKkp0OJCRYLH42k4rU3Vf6npNsd6BFz6HDUjmxaONKt4KMDpC5nArRWXaK1xFE2gllUzTnu8GSEzYmSzf4RRPWK7ajgI9DRerbu20+hnZKuH9/AFxT4GwqkyodpO8gYG3zRDiwaf3eoDbWPUus0qMqd983NaLk3iil8CaacrT7FNM7WNKzGmx5My4B5620k5EPzwso9L/kXbKnTAuSrNGw3H7UaT1ofzYbg8nqXqVuvbTho37630yna3R+8oO8WcwJ79WzNB/bguL8d91xTd3yUnSUjMYCgcpwa5ld16aN6uuufypeGjaLRq+5t35o/G0sRF1N+ZTdRDS5Pew3/uspChrQu6MVV51YSx82b0/4oQiZEWDJHE7JWprMlUj0Lj1ghca2X3p9KTFfPLxJ++IoBFa2Bx7/4jK/1TViFmNiMlgyOBnZ8aoAABeKcnh4TKPeT/hTqcqKmenUPBc0cY8ZjhTzODXgfr505Th12kod2LiVSlr732Y65ihUd0WPpoHzl/YY2kAndKeLLINwvakxGAQgIWNq/VhlUAHGB7yompo7dj1wbCFOKyNK0W0M=
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # goobox-sync-sia
 [![Build Status](https://travis-ci.org/GooBox/goobox-sync-sia.svg?branch=master)](https://travis-ci.org/GooBox/goobox-sync-sia)
 [![Build status](https://ci.appveyor.com/api/projects/status/j4lv9lnd07o1qe5n/branch/master?svg=true)](https://ci.appveyor.com/project/jkawamoto/goobox-sync-sia/branch/master)
-[![Release](https://img.shields.io/badge/release-0.2.2-brightgreen.svg)](https://github.com/GooBox/goobox-sync-sia/releases/tag/v0.2.2)
+[![Release](https://img.shields.io/badge/release-0.2.3-brightgreen.svg)](https://github.com/GooBox/goobox-sync-sia/releases/tag/v0.2.3)
 [![GPLv3](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://www.gnu.org/copyleft/gpl.html)
 
 sync app for [sia](https://sia.tech/).

diff --git a/apispec b/apispec
diff --git a/build.gradle b/build.gradle
@@ -31,7 +31,7 @@ apply plugin: 'application'
 apply plugin: 'idea'
 apply plugin: "com.github.kt3k.coveralls"
 
-version = '0.2.2'
+version = '0.2.3'
 mainClassName = 'io.goobox.sync.sia.App'
 applicationDefaultJvmArgs = ["-Dlogback.statusListenerClass=ch.qos.logback.core.status.NopStatusListener"]
 
@@ -50,10 +50,10 @@ repositories {
 }
 
 dependencies {
-    compile 'io.swagger:swagger-annotations:1.5.19'
+    compile 'io.swagger:swagger-annotations:1.5.20'
     compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
     compile 'io.gsonfire:gson-fire:1.8.3'
-    compile 'joda-time:joda-time:2.9.9'
+    compile 'joda-time:joda-time:2.10'
     compile 'org.threeten:threetenbp:1.3.6'
     compile 'org.apache.commons:commons-lang3:3.7'
     compile 'commons-cli:commons-cli:1.4'
@@ -64,10 +64,10 @@ dependencies {
     compile 'net.java.dev.jna:jna-platform:4.5.1'
     compile 'io.methvin:directory-watcher:0.5.1'
     compile 'ch.qos.logback:logback-classic:1.2.3'
-    compile 'org.jetbrains:annotations:16.0.1'
+    compile 'org.jetbrains:annotations:16.0.2'
     compile 'io.goobox:goobox-sync-common:0.0.9'
     testCompile 'junit:junit:4.12'
-    testCompile 'org.jmockit:jmockit:1.38'
+    testCompile 'org.jmockit:jmockit:1.39'
     testCompile 'com.squareup.okhttp3:mockwebserver:3.10.0'
 }
 
@@ -99,7 +99,7 @@ test {
     }
 }
 
-def siaVersion = 'v1.3.2'
+def siaVersion = 'v1.3.3'
 def siaArchives = [
         ['key': 'win64', 'value': 'windows-amd64'],
         ['key': 'linux', 'value': 'linux-amd64'],

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 26 17:20:15 EDT 2018
+#Tue May 17 23:08:05 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
diff --git a/pom.xml b/pom.xml
@@ -225,7 +225,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <project-version>0.2.2</project-version>
+    <project-version>0.2.3</project-version>
     <java.version>1.7</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>

diff --git a/src/main/java/io/goobox/sync/sia/App.java b/src/main/java/io/goobox/sync/sia/App.java
@@ -91,7 +91,7 @@ public final class App implements Callable<Integer>, OverlayIconProvider {
     /**
      * Version information.
      */
-    public static final String Version = "0.2.2";
+    public static final String Version = "0.2.3";
 
     /**
      * The number of the minimum required contracts.

diff --git a/src/main/java/io/goobox/sync/sia/Config.java b/src/main/java/io/goobox/sync/sia/Config.java
@@ -93,7 +93,7 @@ public class Config {
      * it can be null.
      */
     @Nullable
-    private Integer dataPieces;
+    private Long dataPieces;
 
     /**
      * The number of parity pieces to use when erasure coding the file. Total
@@ -104,7 +104,7 @@ public class Config {
      * it can be null.
      */
     @Nullable
-    private Integer parityPieces;
+    private Long parityPieces;
 
     /**
      * If true, disable auto funds allocation;
@@ -181,20 +181,20 @@ public Path getDataDir() {
     }
 
     @Nullable
-    public Integer getDataPieces() {
+    public Long getDataPieces() {
         return dataPieces;
     }
 
-    void setDataPieces(@Nullable Integer dataPieces) {
+    void setDataPieces(@Nullable Long dataPieces) {
         this.dataPieces = dataPieces;
     }
 
     @Nullable
-    public Integer getParityPieces() {
+    public Long getParityPieces() {
         return parityPieces;
     }
 
-    void setParityPieces(@Nullable Integer parityPieces) {
+    void setParityPieces(@Nullable Long parityPieces) {
         this.parityPieces = parityPieces;
     }
 
@@ -321,14 +321,14 @@ public static Config load(@NotNull final Path filePath) throws IOException {
         final String dataPieces = props.getProperty(DataPieces);
         if (dataPieces != null) {
             try {
-                cfg.setDataPieces(Integer.valueOf(dataPieces));
+                cfg.setDataPieces(Long.valueOf(dataPieces));
             } catch (final NumberFormatException e) {
                 logger.warn("Invalid data pieces {}", dataPieces);
             }
         }
         final String parityPieces = props.getProperty(ParityPieces);
         try {
-            final int value = Integer.valueOf(parityPieces);
+            final long value = Long.valueOf(parityPieces);
             if (value >= MinimumParityPieces) {
                 cfg.setParityPieces(value);
             } else {

diff --git a/src/main/java/io/goobox/sync/sia/client/ApiCallback.java b/src/main/java/io/goobox/sync/sia/client/ApiCallback.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.

diff --git a/src/main/java/io/goobox/sync/sia/client/ApiClient.java b/src/main/java/io/goobox/sync/sia/client/ApiClient.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.

diff --git a/src/main/java/io/goobox/sync/sia/client/ApiException.java b/src/main/java/io/goobox/sync/sia/client/ApiException.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-02-24T04:09:14.967-05:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-06-12T09:40:06.745-04:00")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;

diff --git a/src/main/java/io/goobox/sync/sia/client/ApiResponse.java b/src/main/java/io/goobox/sync/sia/client/ApiResponse.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.

diff --git a/src/main/java/io/goobox/sync/sia/client/Configuration.java b/src/main/java/io/goobox/sync/sia/client/Configuration.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -13,7 +13,7 @@
 
 package io.goobox.sync.sia.client;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-02-24T04:09:14.967-05:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-06-12T09:40:06.745-04:00")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 

diff --git a/src/main/java/io/goobox/sync/sia/client/GzipRequestInterceptor.java b/src/main/java/io/goobox/sync/sia/client/GzipRequestInterceptor.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.

diff --git a/src/main/java/io/goobox/sync/sia/client/JSON.java b/src/main/java/io/goobox/sync/sia/client/JSON.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.

diff --git a/src/main/java/io/goobox/sync/sia/client/Pair.java b/src/main/java/io/goobox/sync/sia/client/Pair.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -13,7 +13,7 @@
 
 package io.goobox.sync.sia.client;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-02-24T04:09:14.967-05:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-06-12T09:40:06.745-04:00")
 public class Pair {
     private String name = "";
     private String value = "";

diff --git a/src/main/java/io/goobox/sync/sia/client/ProgressRequestBody.java b/src/main/java/io/goobox/sync/sia/client/ProgressRequestBody.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.

diff --git a/src/main/java/io/goobox/sync/sia/client/ProgressResponseBody.java b/src/main/java/io/goobox/sync/sia/client/ProgressResponseBody.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.

diff --git a/src/main/java/io/goobox/sync/sia/client/StringUtil.java b/src/main/java/io/goobox/sync/sia/client/StringUtil.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -13,7 +13,7 @@
 
 package io.goobox.sync.sia.client;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-02-24T04:09:14.967-05:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-06-12T09:40:06.745-04:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).

diff --git a/src/main/java/io/goobox/sync/sia/client/api/ConsensusApi.java b/src/main/java/io/goobox/sync/sia/client/api/ConsensusApi.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.

diff --git a/src/main/java/io/goobox/sync/sia/client/api/DaemonApi.java b/src/main/java/io/goobox/sync/sia/client/api/DaemonApi.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.

diff --git a/src/main/java/io/goobox/sync/sia/client/api/GatewayApi.java b/src/main/java/io/goobox/sync/sia/client/api/GatewayApi.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.

diff --git a/src/main/java/io/goobox/sync/sia/client/api/HostApi.java b/src/main/java/io/goobox/sync/sia/client/api/HostApi.java
@@ -2,7 +2,7 @@
  * Sia
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
- * OpenAPI spec version: 1.0.0
+ * OpenAPI spec version: 1.3.3
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.