Merge pull request #29 from vechain/dev

Fix issue #28

Author: potti

LICENSE

@@ -0,0 +1,22 @@
+MIT License
+
+thor-client-sdk4j is licensed under the MIT LICENSE, also included in LICENSE file in the repository.
+Copyright (c) 2019 VeChain
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -7,13 +7,13 @@ A SDK toolkit for client to call VeChainThor Restful API.
 Requires JDK8.
 
 - - - -
-latest version 0.0.9
+latest version 0.0.10
 
 - - - -
 default package jar without dependencies,use -Pall to build all in one jar
 
 ## License
-Thor Java Client SDK is licensed under the GNU Lesser General Public License v3.0, also included in LICENSE file in repository.
+Thor Java Client SDK is licensed under the MIT LICENSE, also included in LICENSE file in the repository.
 - - - -
 
 ## Set blockchain nodes provider
@@ -845,7 +845,7 @@ Package the jar with maven
 ```
 mvn clean package -Dmaven.test.skip=true
 
-The maven will generate the jar file in folder target: thor-client-sdk4j-0.0.9.jar
+The maven will generate the jar file in folder target: thor-client-sdk4j-0.0.10.jar
 
 ```
 
@@ -857,9 +857,9 @@ There is a example transaction file in src/main/resources/exchange_example.xlsx,
 
 ```
  
-java -jar thor-client-sdk4j-0.0.9.jar getChainTag {blockchain-server-url}
+java -jar thor-client-sdk4j-0.0.10.jar getChainTag {blockchain-server-url}
 
-eg. java -jar thor-client-sdk4j-0.0.9.jar getChainTag http://localhost:8669
+eg. java -jar thor-client-sdk4j-0.0.10.jar getChainTag http://localhost:8669
 
 ChainTag:
 0x27
@@ -870,9 +870,9 @@ ChainTag:
 #### Get blockRef: 
 
 ```
-java -jar thor-client-sdk4j-0.0.9.jar getBlockRef {blockchain-server-url}
+java -jar thor-client-sdk4j-0.0.10.jar getBlockRef {blockchain-server-url}
 
-eg. java -jar thor-client-sdk4j-0.0.9.jar getBlockRef http://localhost:8669
+eg. java -jar thor-client-sdk4j-0.0.10.jar getBlockRef http://localhost:8669
 
 BlockRef:
 0x0000695540f491a5
@@ -882,9 +882,9 @@ BlockRef:
 #### Create wallet: 
 
 ```
-java -jar thor-client-sdk4j-0.0.9.jar createWallet {wallet-password} {keystore-file-path}(optional, defalut: ./keystore.json)
+java -jar thor-client-sdk4j-0.0.10.jar createWallet {wallet-password} {keystore-file-path}(optional, defalut: ./keystore.json)
 
-eg. java -jar thor-client-sdk4j-0.0.9.jar createWallet <your password> <keystore-file-path>
+eg. java -jar thor-client-sdk4j-0.0.10.jar createWallet <your password> <keystore-file-path>
 
 The keystore.json file will generate in current folder.
 
@@ -922,9 +922,9 @@ The wallet created successfully and the key store is:
 #### Get block: 
 
 ```
- java -jar thor-client-sdk4j-0.0.9.jar getBlock {blockchain-server-url}
+ java -jar thor-client-sdk4j-0.0.10.jar getBlock {blockchain-server-url}
 
-eg. java -jar thor-client-sdk4j-0.0.9.jar getBlock http://localhost:8669
+eg. java -jar thor-client-sdk4j-0.0.10.jar getBlock http://localhost:8669
 
 Block:
 {
@@ -953,9 +953,9 @@ Block:
 
 ```
   
-java -jar thor-client-sdk4j-0.0.9.jar getTransaction {transaction-id} {blockchain-server-url}
+java -jar thor-client-sdk4j-0.0.10.jar getTransaction {transaction-id} {blockchain-server-url}
 
-eg. java -jar thor-client-sdk4j-0.0.9.jar getTransaction 0x19dd77d28ef70be8c924319a6c08b996dd456fa36f29f2427dbda90087a8a897 http://localhost:8669
+eg. java -jar thor-client-sdk4j-0.0.10.jar getTransaction 0x19dd77d28ef70be8c924319a6c08b996dd456fa36f29f2427dbda90087a8a897 http://localhost:8669
 
 Transaction:
 {
@@ -978,9 +978,9 @@ Transaction:
 
 ```
   
-java -jar thor-client-sdk4j-0.0.9.jar getTransactionReceipt {transaction-id} {blockchain-server-url}
+java -jar thor-client-sdk4j-0.0.10.jar getTransactionReceipt {transaction-id} {blockchain-server-url}
   
-eg. java -jar thor-client-sdk4j-0.0.9.jar getTransactionReceipt 0x6b99c0f1ebfa3b9d93dcfc503f468104ac74271728841551aaa44115d080f5b5 http://localhost:8669
+eg. java -jar thor-client-sdk4j-0.0.10.jar getTransactionReceipt 0x6b99c0f1ebfa3b9d93dcfc503f468104ac74271728841551aaa44115d080f5b5 http://localhost:8669
   
 Receipt:
 {
@@ -1017,9 +1017,9 @@ Receipt:
 #### Sign transactions: 
 
 ```
-java -jar thor-client-sdk4j-0.0.9.jar sign {your-file-path} {privateKey}
+java -jar thor-client-sdk4j-0.0.10.jar sign {your-file-path} {privateKey}
 
-eg. java -jar thor-client-sdk4j-0.0.9.jar sign src/main/resources/exchange_example.xlsx 0xe0b80216ba7b880d85966b38fcd8f7253882bb1386b68b33a8e0b60775e947c0
+eg. java -jar thor-client-sdk4j-0.0.10.jar sign src/main/resources/exchange_example.xlsx 0xe0b80216ba7b880d85966b38fcd8f7253882bb1386b68b33a8e0b60775e947c0
   
 Raw Transaction:
 0xf8a3819a8702819f5cfc12d38202d0f842e094d3ef28df6b553ed2fc47259e8134319cb1121a2a89364200111c48f8000080e094d3ef28df6b553ed2fc47259e8134319cb1121a2a89364200111c48f80000808082a4108088f06f91293e58610dc0b84173346fba62605d510895a0d240b89a38e0b87fd8a58df2ce17075cd493e8e316528b4ed0f049cef1710936bbd4bd3af23eb3ffb3740dc0fb59db585714dbeaa001
@@ -1028,9 +1028,9 @@ Raw Transaction:
 #### Sign VTHO transactions: 
 
 ```
-java -jar thor-client-sdk4j-0.0.9.jar signVTHO {your-file-path} {privateKey}
+java -jar thor-client-sdk4j-0.0.10.jar signVTHO {your-file-path} {privateKey}
 
-eg. java -jar thor-client-sdk4j-0.0.9.jar signVTHO src/main/resources/exchange_example.xlsx 0xdce1443bd2ef0c2631adc1c67e5c93f13dc23a41c18b536effbbdcbcdb96fb65
+eg. java -jar thor-client-sdk4j-0.0.10.jar signVTHO src/main/resources/exchange_example.xlsx 0xdce1443bd2ef0c2631adc1c67e5c93f13dc23a41c18b536effbbdcbcdb96fb65
   
 Raw Transaction:
 0xf9011d81c787015e41be43bb958202d0f8bcf85c940000000000000000000000000000456e6572677980b844a9059cbb000000000000000000000000d3ef28df6b553ed2fc47259e8134319cb1121a2a0000000000000000000000000000000000000000000027cf801b9d4f7d800000f85c940000000000000000000000000000456e6572677980b844a9059cbb000000000000000000000000f881a94423f22ee9a0e3e1442f515f43c966b7ed0000000000000000000000000000000000000000000027cf801b9d4f7d8000008082a41080887650b326b78e0c57c0b841fe27b8866d8a658a66a2d8241a310d1ef72e2954d397fc52aa5b4295f9686d0f6705301acc9a0aac6e9e0f93e3aa6fe0a07ff48e4e3287d0db45905d8a0756eb01
@@ -1041,9 +1041,9 @@ Raw Transaction:
 
 ```
   
-java -jar thor-client-sdk4j-0.0.9.jar signAndSend {blockchain-server-url} {privateKey} {your-file-path}
+java -jar thor-client-sdk4j-0.0.10.jar signAndSend {blockchain-server-url} {privateKey} {your-file-path}
 
-eg. java -jar thor-client-sdk4j-0.0.9.jar signAndSend http://localhost:8669 0xe0b80216ba7b880d85966b38fcd8f7253882bb1386b68b33a8e0b60775e947c0 src/main/resources/exchange_example.xlsx
+eg. java -jar thor-client-sdk4j-0.0.10.jar signAndSend http://localhost:8669 0xe0b80216ba7b880d85966b38fcd8f7253882bb1386b68b33a8e0b60775e947c0 src/main/resources/exchange_example.xlsx
   
 Send Result:
 {"id":"0xd751c50b81c1f13ebd86f4fcd0028a501b6c792fa8b5bbf64028b924a6b2efc9"}
@@ -1056,9 +1056,9 @@ Send Result:
 
 ```
   
-java -jar thor-client-sdk4j-0.0.9.jar sendRaw {blockchain-server-url} {raw}
+java -jar thor-client-sdk4j-0.0.10.jar sendRaw {blockchain-server-url} {raw}
 
-eg. java -jar thor-client-sdk4j-0.0.9.jar sendRaw http://localhost:8669 0xf8a3819a8702819f5cfc12d38202d0f842e094d3ef28df6b553ed2fc47259e8134319cb1121a2a89364200111c48f8000080e094d3ef28df6b553ed2fc47259e8134319cb1121a2a89364200111c48f80000808082a4108088f06f91293e58610dc0b84173346fba62605d510895a0d240b89a38e0b87fd8a58df2ce17075cd493e8e316528b4ed0f049cef1710936bbd4bd3af23eb3ffb3740dc0fb59db585714dbeaa001
+eg. java -jar thor-client-sdk4j-0.0.10.jar sendRaw http://localhost:8669 0xf8a3819a8702819f5cfc12d38202d0f842e094d3ef28df6b553ed2fc47259e8134319cb1121a2a89364200111c48f8000080e094d3ef28df6b553ed2fc47259e8134319cb1121a2a89364200111c48f80000808082a4108088f06f91293e58610dc0b84173346fba62605d510895a0d240b89a38e0b87fd8a58df2ce17075cd493e8e316528b4ed0f049cef1710936bbd4bd3af23eb3ffb3740dc0fb59db585714dbeaa001
   
 Send Result:
 {"id":"0xd751c50b81c1f13ebd86f4fcd0028a501b6c792fa8b5bbf64028b924a6b2efc9"}

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.vechain.client</groupId>
 	<artifactId>thor-client-sdk4j</artifactId>
-	<version>0.0.9</version>
+	<version>0.0.10</version>
 	<packaging>jar</packaging>
 
 	<modelVersion>4.0.0</modelVersion>

src/main/java/com/vechain/thorclient/core/model/blockchain/NodeProvider.java

@@ -4,92 +4,106 @@
 import com.vechain.thorclient.utils.StringUtils;
 
 /**
- * The blockchain node provider pojo object.
- * Set and get url and connecting timeout(in milliseconds).
+ * The blockchain node provider pojo object. Set and get url and connecting
+ * timeout(in milliseconds).
  */
 public class NodeProvider {
 
-    private static NodeProvider INSTANCE = new NodeProvider();
-
-    public static NodeProvider getNodeProvider() {
-        return INSTANCE;
-    }
-
-    private NodeProvider() {
-        this.socketTimeout = 5000;
-        this.connectTimeout = 5000;
-    }
-
-    /**
-     * get provider url
-     * @return the url of the nodes.
-     */
-    public String getProvider() {
-        if (StringUtils.isBlank(this.provider) || !this.provider.startsWith("http")) {
-            throw new RuntimeException("The blockchain provider url must be set.");
-        }
-        return provider;
-    }
-
-    /**
-     * Set provider url
-     * @param provider the completed url of the nodes
-     */
-    public void setProvider(String provider) {
-        this.provider = provider;
-    }
-
-    /**
-     * set socket timeout
-     * @return milliseconds
-     */
-    public int getSocketTimeout() {
-        return socketTimeout;
-    }
-
-    /**
-     * Set  socket timeout
-     * @param timeout milliseconds
-     */
-    public void setSocketTimeout(int timeout) {
-        this.socketTimeout = timeout;
-    }
-
-
-    /**
-     * Set connect timeout, socket timeout
-     * @param timeout milliseconds
-     */
-    public  void setTimeout(int timeout){
-        AbstractClient.setTimeout(timeout);
-    }
-
-
-    public void setConnectTimeout(int connectTimeout) {
-        this.connectTimeout = connectTimeout;
-    }
-
-    public  int getConnectTimeout(){
-        return this.connectTimeout;
-    }
-
-
-    public String getWsProvider() {
-        if (StringUtils.isBlank(this.wsProvider) || !this.wsProvider.startsWith("ws")) {
-            throw new RuntimeException("The blockchain provider url must be set.");
-        }
-        return wsProvider;
-    }
-
-    public void setWsProvider(String wsProvider) {
-        this.wsProvider = wsProvider;
-    }
-
-    private String provider;
-
-
-    private String wsProvider;
-    private int    socketTimeout;
-    private int connectTimeout;
-
+	private static NodeProvider INSTANCE = new NodeProvider();
+
+	public static NodeProvider getNodeProvider() {
+		return INSTANCE;
+	}
+
+	private NodeProvider() {
+		this.socketTimeout = 5000;
+		this.connectTimeout = 5000;
+	}
+
+	/**
+	 * get provider url
+	 * 
+	 * @return the url of the nodes.
+	 */
+	public String getProvider() {
+		String url = StringUtils.isBlank(getProviderThreadLocal()) ? this.provider : getProviderThreadLocal();
+		if (StringUtils.isBlank(url) || !url.startsWith("http")) {
+			throw new RuntimeException("The blockchain provider url must be set.");
+		}
+		return url;
+	}
+
+	/**
+	 * Set provider url
+	 * 
+	 * @param provider the completed url of the nodes
+	 */
+	public void setProvider(String provider) {
+		this.provider = provider;
+	}
+
+	/**
+	 * set socket timeout
+	 * 
+	 * @return milliseconds
+	 */
+	public int getSocketTimeout() {
+		return socketTimeout;
+	}
+
+	/**
+	 * Set socket timeout
+	 * 
+	 * @param timeout milliseconds
+	 */
+	public void setSocketTimeout(int timeout) {
+		this.socketTimeout = timeout;
+	}
+
+	/**
+	 * Set connect timeout, socket timeout
+	 * 
+	 * @param timeout milliseconds
+	 */
+	public void setTimeout(int timeout) {
+		AbstractClient.setTimeout(timeout);
+	}
+
+	public void setConnectTimeout(int connectTimeout) {
+		this.connectTimeout = connectTimeout;
+	}
+
+	public int getConnectTimeout() {
+		return this.connectTimeout;
+	}
+
+	public String getWsProvider() {
+		if (StringUtils.isBlank(this.wsProvider) || !this.wsProvider.startsWith("ws")) {
+			throw new RuntimeException("The blockchain provider url must be set.");
+		}
+		return wsProvider;
+	}
+
+	public void setWsProvider(String wsProvider) {
+		this.wsProvider = wsProvider;
+	}
+
+	private String provider;
+
+	private String wsProvider;
+	private int socketTimeout;
+	private int connectTimeout;
+	private static ThreadLocal<String> providerThreadLocal = new ThreadLocal<String>();
+
+	public void setProviderThreadLocal(String url) {
+		providerThreadLocal.set(url);
+	}
+
+	public String getProviderThreadLocal() {
+		return providerThreadLocal.get();
+	}
+
+	public void cleanProviderThreadLocal() {
+		providerThreadLocal.remove();
+	}
 }