Fix checkstyle

Author: iikirilov

codegen/src/main/java/org/web3j/codegen/SolidityFunctionWrapper.java

@@ -280,26 +280,34 @@ private List<MethodSpec> buildFunctionDefinitions(
         // constructor will not be specified in ABI file if its empty
         if (!constructor) {
             MethodSpec.Builder credentialsMethodBuilder =
-                    getDeployMethodSpec(className, Credentials.class, CREDENTIALS, false, true);
+                    getDeployMethodSpec(className, Credentials.class, CREDENTIALS,
+                            false, true);
             methodSpecs.add(buildDeployNoParams(
-                    credentialsMethodBuilder, className, CREDENTIALS, false, true));
+                    credentialsMethodBuilder, className, CREDENTIALS,
+                    false, true));
 
             MethodSpec.Builder credentialsMethodBuilderNoGasProvider =
-                    getDeployMethodSpec(className, Credentials.class, CREDENTIALS, false, false);
+                    getDeployMethodSpec(className, Credentials.class, CREDENTIALS,
+                            false, false);
             methodSpecs.add(buildDeployNoParams(
-                    credentialsMethodBuilderNoGasProvider, className, CREDENTIALS, false, false));
+                    credentialsMethodBuilderNoGasProvider, className, CREDENTIALS,
+                    false, false));
 
             MethodSpec.Builder transactionManagerMethodBuilder =
                     getDeployMethodSpec(
-                            className, TransactionManager.class, TRANSACTION_MANAGER, false, true);
+                            className, TransactionManager.class, TRANSACTION_MANAGER,
+                            false, true);
             methodSpecs.add(buildDeployNoParams(
-                    transactionManagerMethodBuilder, className, TRANSACTION_MANAGER, false, true));
+                    transactionManagerMethodBuilder, className, TRANSACTION_MANAGER,
+                    false, true));
 
             MethodSpec.Builder transactionManagerMethodBuilderNoGasProvider =
                     getDeployMethodSpec(
-                            className, TransactionManager.class, TRANSACTION_MANAGER, false, false);
+                            className, TransactionManager.class, TRANSACTION_MANAGER,
+                            false, false);
             methodSpecs.add(buildDeployNoParams(
-                    transactionManagerMethodBuilderNoGasProvider, className, TRANSACTION_MANAGER, false, false));
+                    transactionManagerMethodBuilderNoGasProvider, className, TRANSACTION_MANAGER,
+                    false, false));
         }
 
         return methodSpecs;
@@ -328,14 +336,15 @@ Iterable<FieldSpec> buildFuncNameConstants(List<AbiDefinition> functionDefinitio
         return fields;
     }
 
-    private static MethodSpec buildConstructor(Class authType, String authName, boolean withGasProvider) {
+    private static MethodSpec buildConstructor(Class authType, String authName,
+                                               boolean withGasProvider) {
         MethodSpec.Builder toReturn = MethodSpec.constructorBuilder()
                 .addModifiers(Modifier.PROTECTED)
                 .addParameter(String.class, CONTRACT_ADDRESS)
                 .addParameter(Web3j.class, WEB3J)
                 .addParameter(authType, authName);
 
-        if(withGasProvider) {
+        if (withGasProvider) {
             toReturn.addParameter(ContractGasProvider.class, CONTRACT_GAS_PROVIDER)
                     .addStatement("super($N, $N, $N, $N, $N)",
                             BINARY, CONTRACT_ADDRESS, WEB3J, authName, CONTRACT_GAS_PROVIDER);
@@ -362,9 +371,11 @@ private MethodSpec buildDeploy(
 
         if (!inputParams.isEmpty()) {
             return buildDeployWithParams(
-                    methodBuilder, className, inputParams, authName, isPayable, withGasProvider);
+                    methodBuilder, className, inputParams, authName,
+                    isPayable, withGasProvider);
         } else {
-            return buildDeployNoParams(methodBuilder, className, authName, isPayable, withGasProvider);
+            return buildDeployNoParams(methodBuilder, className, authName,
+                    isPayable, withGasProvider);
         }
     }
 
@@ -428,7 +439,8 @@ private static MethodSpec buildDeployNoParams(
     }
 
     private static MethodSpec.Builder getDeployMethodSpec(
-            String className, Class authType, String authName, boolean isPayable, boolean withGasProvider) {
+            String className, Class authType, String authName,
+            boolean isPayable, boolean withGasProvider) {
         MethodSpec.Builder builder = MethodSpec.methodBuilder("deploy")
                 .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
                 .returns(
@@ -444,8 +456,7 @@ private static MethodSpec.Builder getDeployMethodSpec(
                     .addParameter(BigInteger.class, INITIAL_VALUE);
         } else if (!isPayable && withGasProvider) {
             return builder.addParameter(ContractGasProvider.class, CONTRACT_GAS_PROVIDER);
-        }
-        else {
+        } else {
             return builder.addParameter(BigInteger.class, GAS_PRICE)
                     .addParameter(BigInteger.class, GAS_LIMIT);
         }
@@ -460,7 +471,7 @@ private static MethodSpec buildLoad(
                 .addParameter(Web3j.class, WEB3J)
                 .addParameter(authType, authName);
 
-        if(withGasProvider) {
+        if (withGasProvider) {
             toReturn.addParameter(ContractGasProvider.class, CONTRACT_GAS_PROVIDER)
                     .addStatement("return new $L($L, $L, $L, $L)", className,
                             CONTRACT_ADDRESS, WEB3J, authName, CONTRACT_GAS_PROVIDER);

core/src/main/java/org/web3j/tx/Contract.java

@@ -398,6 +398,19 @@ protected static <T extends Contract> T deploy(
                 binary, encodedConstructor, value);
     }
 
+    @Deprecated
+    protected static <T extends Contract> T deploy(
+            Class<T> type,
+            Web3j web3j, TransactionManager transactionManager,
+            BigInteger gasPrice, BigInteger gasLimit,
+            String binary, String encodedConstructor, BigInteger value)
+            throws IOException, TransactionException {
+
+        return deploy(type, web3j, transactionManager,
+                new StaticGasProvider(gasPrice, gasLimit),
+                binary, encodedConstructor, value);
+    }
+
     public static <T extends Contract> RemoteCall<T> deployRemoteCall(
             Class<T> type,
             Web3j web3j, Credentials credentials,
@@ -417,6 +430,7 @@ public static <T extends Contract> RemoteCall<T> deployRemoteCall(
                 type, web3j, credentials, gasPrice, gasLimit,
                 binary, encodedConstructor, BigInteger.ZERO);
     }
+
     public static <T extends Contract> RemoteCall<T> deployRemoteCall(
             Class<T> type,
             Web3j web3j, Credentials credentials,
@@ -437,20 +451,6 @@ public static <T extends Contract> RemoteCall<T> deployRemoteCall(
                 encodedConstructor, BigInteger.ZERO));
     }
 
-    @Deprecated
-    protected static <T extends Contract> T deploy(
-            Class<T> type,
-            Web3j web3j, TransactionManager transactionManager,
-            BigInteger gasPrice, BigInteger gasLimit,
-            String binary, String encodedConstructor, BigInteger value)
-            throws IOException, TransactionException {
-
-        return deploy(type, web3j, transactionManager,
-                new StaticGasProvider(gasPrice, gasLimit),
-                binary, encodedConstructor, value);
-    }
-
-
     public static <T extends Contract> RemoteCall<T> deployRemoteCall(
             Class<T> type,
             Web3j web3j, TransactionManager transactionManager,