1. Bumped version to 2.0.

2. Regenerated integration test Solidity contract wrappers. 3. Removed Optional from EthBlock. 4. Updated SolidityFunctionWrapperGenerator to create lowercase event method names.
hyperledger · Feb 10, 2017 · 56541af · 56541af
1 parent 6046938
commit 56541af
Show file tree

Hide file tree

Showing 17 changed files with 99 additions and 73 deletions.
diff --git a/README.rst b/README.rst
@@ -85,7 +85,7 @@ Java 8:
    <dependency>
      <groupId>org.web3j</groupId>
      <artifactId>core</artifactId>
-     <version>1.1.2</version>
+     <version>2.0.0</version>
    </dependency>
 
 Android:
@@ -105,7 +105,7 @@ Java 8:
 
 .. code-block:: groovy
 
-   compile ('org.web3j:core:1.1.2')
+   compile ('org.web3j:core:2.0.0')
 
 Android:
 
@@ -453,4 +453,5 @@ Thanks and credits
   `@matthiaszimmermann <https://github.com/matthiaszimmermann>`_,
   `@ferOnti <https://github.com/ferOnti>`_, `@fraspadafora <https://github.com/fraspadafora>`_,
   `@bigstar119 <https://github.com/bigstar119>`_, `@gagarin55 <https://github.com/gagarin55>`_,
-  `@thedoctor <https://github.com/thedoctor>`_
+  `@thedoctor <https://github.com/thedoctor>`_, `@tramonex-nate <https://github.com/tramonex-nate>`_,
+  `@ferOnti <https://github.com/ferOnti>`_
diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'application'
 
 group 'org.web3j'
-version '1.2.0'
+version '2.0.0'
 
 sourceCompatibility = 1.8
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.2'
+version = u'2.0'
 # The full version, including alpha/beta/rc tags.
-release = u'1.2.0'
+release = u'2.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/source/credits.rst b/docs/source/credits.rst
@@ -17,4 +17,5 @@ Thanks and Credits
   `@matthiaszimmermann <https://github.com/matthiaszimmermann>`_,
   `@ferOnti <https://github.com/ferOnti>`_, `@fraspadafora <https://github.com/fraspadafora>`_,
   `@bigstar119 <https://github.com/bigstar119>`_, `@gagarin55 <https://github.com/gagarin55>`_,
-  `@thedoctor <https://github.com/thedoctor>`_,
+  `@thedoctor <https://github.com/thedoctor>`_, `@tramonex-nate <https://github.com/tramonex-nate>`_,
+  `@ferOnti <https://github.com/ferOnti>`_
diff --git a/docs/source/getting_started.rst b/docs/source/getting_started.rst
@@ -13,7 +13,7 @@ Java 8:
    <dependency>
      <groupId>org.web3j</groupId>
      <artifactId>core</artifactId>
-     <version>1.1.2</version>
+     <version>2.0.0</version>
    </dependency>
 
 Android:
@@ -33,7 +33,7 @@ Java 8:
 
 .. code-block:: groovy
 
-   compile ('org.web3j:core:1.1.2')
+   compile ('org.web3j:core:2.0.0')
 
 Android:
 

diff --git a/src/integration-test/java/org/web3j/generated/Arrays.java b/src/integration-test/java/org/web3j/generated/Arrays.java
@@ -1,9 +1,9 @@
 package org.web3j.generated;
 
+import java.lang.String;
 import java.math.BigInteger;
 import java.util.Collections;
 import java.util.concurrent.Future;
-
 import org.web3j.abi.TypeReference;
 import org.web3j.abi.datatypes.DynamicArray;
 import org.web3j.abi.datatypes.Function;
@@ -19,7 +19,9 @@
 /**
  * <p>Auto generated code.<br>
  * <strong>Do not modify!</strong><br>
- * Please use {@link org.web3j.codegen.SolidityFunctionWrapperGenerator} to update.</p>
+ * Please use {@link org.web3j.codegen.SolidityFunctionWrapperGenerator} to update.
+ *
+ * <p>Generated with web3j version 2.0.0.
  */
 public final class Arrays extends Contract {
     private static final String BINARY = "60606040526101f5806100126000396000f3606060405260e060020a6000350463b96f54d18114610029578063beda363b146100bc575b610002565b34610002576040805161014081810190925261018191600491610144918390600a90839083908082843750909550505050505061014060405190810160405280600a905b600081526020019060019003908161006d5750600a905060005b818110156101ee5783816001018303600a8110156100025760200201518382600a811015610002576020020152600101610087565b3461000257604080516020600480358082013583810280860185019096528085526101a49592946024949093928501928291850190849080828437509496505050505050506040805160208101825260008082528351925191929182908059106101235750595b90808252806020026020018201604052801561013a575b509250600090505b818110156101ee578381600101830381518110156100025790602001906020020151838281518110156100025760209081029091010152600101610142565b60405180826101408083818460006004602df15090500191505060405180910390f35b60405180806020018281038252838181518152602001915080519060200190602002808383829060006004602084601f0104600302600f01f1509050019250505060405180910390f35b505091905056";

diff --git a/src/integration-test/java/org/web3j/generated/Fibonacci.java b/src/integration-test/java/org/web3j/generated/Fibonacci.java
@@ -1,16 +1,13 @@
 package org.web3j.generated;
 
-
+import java.lang.Override;
+import java.lang.String;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Future;
-
-import rx.Observable;
-import rx.functions.Func1;
-
 import org.web3j.abi.EventEncoder;
 import org.web3j.abi.EventValues;
 import org.web3j.abi.TypeReference;
@@ -26,11 +23,15 @@
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
 import org.web3j.tx.Contract;
 import org.web3j.tx.TransactionManager;
+import rx.Observable;
+import rx.functions.Func1;
 
 /**
  * <p>Auto generated code.<br>
  * <strong>Do not modify!</strong><br>
- * Please use {@link org.web3j.codegen.SolidityFunctionWrapperGenerator} to update.</p>
+ * Please use {@link org.web3j.codegen.SolidityFunctionWrapperGenerator} to update.
+ *
+ * <p>Generated with web3j version 2.0.0.
  */
 public final class Fibonacci extends Contract {
     private static final String BINARY = "606060405260d18060106000396000f3606060405260e060020a60003504633c7fdc708114602657806361047ff4146044575b6002565b34600257605160043560006063825b600081151560a75750600060a2565b3460025760516004356035565b60408051918252519081900360200190f35b604080518481526020810183905281519293507f71e71a8458267085d5ab16980fd5f114d2d37f232479c245d523ce8d23ca40ed929081900390910190a15b919050565b816001141560b65750600160a2565b60c0600283036035565b60ca600184036035565b01905060a256";
@@ -44,7 +45,7 @@ private Fibonacci(String contractAddress, Web3j web3j, TransactionManager transa
     }
 
     public List<NotifyEventResponse> getNotifyEvents(TransactionReceipt transactionReceipt) {
-        Event event = new Event("Notify",
+        Event event = new Event("notify", 
                 Arrays.<TypeReference<?>>asList(),
                 Arrays.<TypeReference<?>>asList(new TypeReference<Uint256>() {}, new TypeReference<Uint256>() {}));
         List<EventValues> valueList = extractEventParameters(event,transactionReceipt);
@@ -58,8 +59,8 @@ public List<NotifyEventResponse> getNotifyEvents(TransactionReceipt transactionR
         return responses;
     }
 
-    public Observable<NotifyEventResponse> NotifyEventObservable() {
-        Event event = new Event("Notify",
+    public Observable<NotifyEventResponse> notifyEventObservable() {
+        Event event = new Event("notify", 
                 Arrays.<TypeReference<?>>asList(),
                 Arrays.<TypeReference<?>>asList(new TypeReference<Uint256>() {}, new TypeReference<Uint256>() {}));
         EthFilter filter = new EthFilter(DefaultBlockParameterName.EARLIEST,DefaultBlockParameterName.LATEST, getContractAddress());
@@ -82,8 +83,8 @@ public Future<TransactionReceipt> fibonacciNotify(Uint256 number) {
     }
 
     public Future<Uint256> fibonacci(Uint256 number) {
-        Function function = new Function("fibonacci",
-                Arrays.<Type>asList(number),
+        Function function = new Function("fibonacci", 
+                Arrays.<Type>asList(number), 
                 Arrays.<TypeReference<?>>asList(new TypeReference<Uint256>() {}));
         return executeCallSingleValueReturnAsync(function);
     }

diff --git a/src/integration-test/java/org/web3j/generated/Greeter.java b/src/integration-test/java/org/web3j/generated/Greeter.java
@@ -1,10 +1,10 @@
 package org.web3j.generated;
 
+import java.lang.String;
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.concurrent.Future;
-
 import org.web3j.abi.FunctionEncoder;
 import org.web3j.abi.TypeReference;
 import org.web3j.abi.datatypes.Function;
@@ -19,7 +19,9 @@
 /**
  * <p>Auto generated code.<br>
  * <strong>Do not modify!</strong><br>
- * Please use {@link org.web3j.codegen.SolidityFunctionWrapperGenerator} to update.</p>
+ * Please use {@link org.web3j.codegen.SolidityFunctionWrapperGenerator} to update.
+ *
+ * <p>Generated with web3j version 2.0.0.
  */
 public final class Greeter extends Contract {
     private static final String BINARY = "606060405260405161026938038061026983398101604052805101600080546c0100000000000000000000000033810204600160a060020a03199091161790558060016000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1060b357805160ff19168380011785555b5060a29291505b8082111560e057600081556001016090565b505050610185806100e46000396000f35b828001600101855582156089579182015b82811115608957825182600050559160200191906001019060c4565b509056606060405260e060020a600035046341c0e1b58114610029578063cfae321714610070575b610002565b34610002576100de6000543373ffffffffffffffffffffffffffffffffffffffff9081169116141561014e5760005473ffffffffffffffffffffffffffffffffffffffff16ff5b3461000257604080516020808201835260008252600180548451600282841615610100026000190190921691909104601f81018490048402820184019095528481526100e094909283018282801561017b5780601f106101505761010080835404028352916020019161017b565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600302600f01f150905090810190601f1680156101405780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b565b820191906000526020600020905b81548152906001019060200180831161015e57829003601f168201915b505050505090509056";