Code cleanup

- remove IDE warnings - optimize imports - fix incorrect usage of Java Generics - fix incorrect Copyright notice
icon-project · Jul 23, 2020 · 05bd8b2 · 05bd8b2
1 parent 789d654
commit 05bd8b2
Show file tree

Hide file tree

Showing 41 changed files with 102 additions and 126 deletions.
diff --git a/library/src/main/java/foundation/icon/icx/Call.java b/library/src/main/java/foundation/icon/icx/Call.java
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package foundation.icon.icx;
@@ -33,15 +32,14 @@
  */
 public final class Call<T> {
 
-    private RpcObject properties;
-    private Class<T> responseType;
+    private final RpcObject properties;
+    private final Class<T> responseType;
 
     private Call(RpcObject properties, Class<T> responseType) {
         this.properties = properties;
         this.responseType = responseType;
     }
 
-
     RpcObject getProperties() {
         return properties;
     }

diff --git a/library/src/main/java/foundation/icon/icx/Callback.java b/library/src/main/java/foundation/icon/icx/Callback.java
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package foundation.icon.icx;

diff --git a/library/src/main/java/foundation/icon/icx/IconService.java b/library/src/main/java/foundation/icon/icx/IconService.java
@@ -12,15 +12,25 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package foundation.icon.icx;
 
 import foundation.icon.icx.crypto.IconKeys;
-import foundation.icon.icx.data.*;
-import foundation.icon.icx.transport.jsonrpc.*;
+import foundation.icon.icx.data.Address;
+import foundation.icon.icx.data.Block;
+import foundation.icon.icx.data.Bytes;
+import foundation.icon.icx.data.ConfirmedTransaction;
+import foundation.icon.icx.data.Converters;
+import foundation.icon.icx.data.ScoreApi;
+import foundation.icon.icx.data.TransactionResult;
+import foundation.icon.icx.transport.jsonrpc.AnnotatedConverterFactory;
+import foundation.icon.icx.transport.jsonrpc.AnnotationConverter;
+import foundation.icon.icx.transport.jsonrpc.RpcConverter;
 import foundation.icon.icx.transport.jsonrpc.RpcConverter.RpcConverterFactory;
+import foundation.icon.icx.transport.jsonrpc.RpcItem;
+import foundation.icon.icx.transport.jsonrpc.RpcObject;
+import foundation.icon.icx.transport.jsonrpc.RpcValue;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -34,9 +44,9 @@
 @SuppressWarnings("WeakerAccess")
 public class IconService {
 
-    private Provider provider;
-    private List<RpcConverter.RpcConverterFactory> converterFactories = new ArrayList<>();
-    private Map<Class, RpcConverter<?>> converterMap = new HashMap<>();
+    private final Provider provider;
+    private final List<RpcConverter.RpcConverterFactory> converterFactories = new ArrayList<>();
+    private final Map<Class<?>, RpcConverter<?>> converterMap = new HashMap<>();
 
     /**
      * Creates an IconService instance
@@ -170,7 +180,7 @@ public Request<ConfirmedTransaction> getTransaction(Bytes hash) {
     }
 
     /**
-     * Gets the result of a transaction by transaction hash
+     * Gets the result of a transaction specified by the transaction hash
      *
      * @param hash a transaction hash
      * @return a {@code TransactionResult} object
@@ -229,7 +239,7 @@ public Request<BigInteger> estimateStep(Transaction transaction) {
 
     @SuppressWarnings("unchecked")
     private <T> RpcConverter<T> findConverter(Class<T> type) {
-        RpcConverter converter = converterMap.get(type);
+        RpcConverter<T> converter = (RpcConverter<T>) converterMap.get(type);
         if (converter != null) return converter;
 
         for (RpcConverterFactory factory : converterFactories) {

diff --git a/library/src/main/java/foundation/icon/icx/KeyWallet.java b/library/src/main/java/foundation/icon/icx/KeyWallet.java
@@ -12,12 +12,16 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package foundation.icon.icx;
 
-import foundation.icon.icx.crypto.*;
+import foundation.icon.icx.crypto.ECDSASignature;
+import foundation.icon.icx.crypto.IconKeys;
+import foundation.icon.icx.crypto.KeyStoreUtils;
+import foundation.icon.icx.crypto.Keystore;
+import foundation.icon.icx.crypto.KeystoreException;
+import foundation.icon.icx.crypto.KeystoreFile;
 import foundation.icon.icx.data.Address;
 import foundation.icon.icx.data.Bytes;
 
@@ -36,8 +40,8 @@
 @SuppressWarnings({"WeakerAccess", "unused"})
 public class KeyWallet implements Wallet {
 
-    private Bytes privateKey;
-    private Bytes publicKey;
+    private final Bytes privateKey;
+    private final Bytes publicKey;
 
     private KeyWallet(Bytes privateKey, Bytes publicKey) {
         this.privateKey = privateKey;
@@ -125,5 +129,4 @@ public Bytes getPrivateKey() {
     public Bytes getPublicKey() {
         return publicKey;
     }
-
 }
diff --git a/library/src/main/java/foundation/icon/icx/Provider.java b/library/src/main/java/foundation/icon/icx/Provider.java
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package foundation.icon.icx;

diff --git a/library/src/main/java/foundation/icon/icx/Request.java b/library/src/main/java/foundation/icon/icx/Request.java
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package foundation.icon.icx;

diff --git a/library/src/main/java/foundation/icon/icx/SignedTransaction.java b/library/src/main/java/foundation/icon/icx/SignedTransaction.java
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package foundation.icon.icx;
@@ -36,8 +35,8 @@
  */
 public class SignedTransaction {
 
-    private Transaction transaction;
-    private Wallet wallet;
+    private final Transaction transaction;
+    private final Wallet wallet;
     private RpcObject properties;
 
     /**

diff --git a/library/src/main/java/foundation/icon/icx/Transaction.java b/library/src/main/java/foundation/icon/icx/Transaction.java
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package foundation.icon.icx;

diff --git a/library/src/main/java/foundation/icon/icx/TransactionBuilder.java b/library/src/main/java/foundation/icon/icx/TransactionBuilder.java
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package foundation.icon.icx;
@@ -77,7 +76,7 @@ public static Builder newBuilder() {
      */
     public static final class Builder {
 
-        private TransactionData transactionData;
+        private final TransactionData transactionData;
 
         private Builder() {
             this.transactionData = new TransactionData();
@@ -227,8 +226,8 @@ public Transaction build() {
      */
     public static final class CallBuilder {
 
-        private TransactionData transactionData;
-        private RpcObject.Builder dataBuilder;
+        private final TransactionData transactionData;
+        private final RpcObject.Builder dataBuilder;
 
         private CallBuilder(TransactionData transactionData, String method) {
             this.transactionData = transactionData;
@@ -277,7 +276,7 @@ public Transaction build() {
      * A Builder for the message transaction.
      */
     public static final class MessageBuilder {
-        private TransactionData transactionData;
+        private final TransactionData transactionData;
 
         private MessageBuilder(TransactionData transactionData, String message) {
             this.transactionData = transactionData;
@@ -300,8 +299,8 @@ public Transaction build() {
      */
     public static final class DeployBuilder {
 
-        private TransactionData transactionData;
-        private RpcObject.Builder dataBuilder;
+        private final TransactionData transactionData;
+        private final RpcObject.Builder dataBuilder;
 
         private DeployBuilder(TransactionData transactionData, String contentType, byte[] content) {
             this.transactionData = transactionData;
@@ -394,7 +393,7 @@ public Transaction build() {
     }
 
     private static class TransactionData {
-        private BigInteger version = new BigInteger("3");
+        private final BigInteger version = new BigInteger("3");
         private Address from;
         private Address to;
         private BigInteger value;
@@ -421,16 +420,16 @@ void checkAddress(Address address, String message) {
     }
 
     private static class RawTransaction implements Transaction {
-        private BigInteger version;
-        private Address from;
-        private Address to;
-        private BigInteger value;
-        private BigInteger stepLimit;
+        private final BigInteger version;
+        private final Address from;
+        private final Address to;
+        private final BigInteger value;
+        private final BigInteger stepLimit;
         private BigInteger timestamp;
-        private BigInteger nid;
-        private BigInteger nonce;
-        private String dataType;
-        private RpcItem data;
+        private final BigInteger nid;
+        private final BigInteger nonce;
+        private final String dataType;
+        private final RpcItem data;
 
         private RawTransaction(TransactionData transactionData) {
             version = transactionData.version;

diff --git a/library/src/main/java/foundation/icon/icx/Wallet.java b/library/src/main/java/foundation/icon/icx/Wallet.java
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package foundation.icon.icx;
@@ -39,5 +38,4 @@ public interface Wallet {
      * @return signature
      */
     byte[] sign(byte[] data);
-
 }
diff --git a/library/src/main/java/foundation/icon/icx/crypto/ECDSASignature.java b/library/src/main/java/foundation/icon/icx/crypto/ECDSASignature.java
@@ -16,7 +16,6 @@
 
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 
 /**
  * Original Code
@@ -33,7 +32,7 @@ public class ECDSASignature {
     private final ECDomainParameters curve = new ECDomainParameters(
             curveParams.getCurve(), curveParams.getG(), curveParams.getN(), curveParams.getH());
 
-    private Bytes privateKey;
+    private final Bytes privateKey;
 
     public ECDSASignature(Bytes privateKey) {
         this.privateKey = privateKey;

diff --git a/library/src/main/java/foundation/icon/icx/crypto/IconKeys.java b/library/src/main/java/foundation/icon/icx/crypto/IconKeys.java
@@ -1,6 +1,5 @@
 package foundation.icon.icx.crypto;
 
-
 import foundation.icon.icx.data.Address;
 import foundation.icon.icx.data.Bytes;
 import org.bouncycastle.crypto.RuntimeCryptoException;
@@ -14,11 +13,17 @@
 import org.bouncycastle.util.encoders.Hex;
 
 import java.math.BigInteger;
-import java.security.*;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.Provider;
+import java.security.SecureRandom;
+import java.security.Security;
 import java.security.spec.ECGenParameterSpec;
 import java.util.Arrays;
 
-
 /**
  * Implementation from
  * https://github.com/web3j/web3j/blob/master/crypto/src/main/java/org/web3j/crypto/Keys.java
@@ -153,5 +158,4 @@ public static boolean isAndroidRuntime() {
         }
         return isAndroid == 1;
     }
-
 }
diff --git a/library/src/main/java/foundation/icon/icx/crypto/KeyStoreUtils.java b/library/src/main/java/foundation/icon/icx/crypto/KeyStoreUtils.java
@@ -12,7 +12,6 @@
 import java.util.InputMismatchException;
 import java.util.TimeZone;
 
-
 /**
  * Original Code
  * https://github.com/web3j/web3j/blob/master/crypto/src/main/java/org/web3j/crypto/WalletUtils.java
@@ -29,7 +28,6 @@ private KeyStoreUtils() { }
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     }
 
-
     public static String generateWalletFile(
             KeystoreFile file, File destinationDirectory) throws IOException {
 
@@ -53,5 +51,4 @@ private static String getWalletFileName(KeystoreFile keystoreFile) {
         dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
         return dateFormat.format(new Date()) + keystoreFile.getAddress() + ".json";
     }
-
 }
diff --git a/library/src/main/java/foundation/icon/icx/crypto/Keystore.java b/library/src/main/java/foundation/icon/icx/crypto/Keystore.java
@@ -1,6 +1,5 @@
 package foundation.icon.icx.crypto;
 
-
 import foundation.icon.icx.data.Bytes;
 import org.bouncycastle.crypto.digests.SHA256Digest;
 import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
@@ -24,7 +23,6 @@
 
 import static foundation.icon.icx.crypto.IconKeys.secureRandom;
 
-
 /**
  * Original Code
  * https://github.com/web3j/web3j/blob/master/crypto/src/main/java/org/web3j/crypto/Wallet.java
@@ -79,10 +77,8 @@ public static KeystoreFile create(String password, Bytes privateKey, int n, int
         byte[] encryptKey = Arrays.copyOfRange(derivedKey, 0, 16);
         byte[] iv = generateRandomBytes(16);
 
-
         byte[] privateKeyBytes = privateKey.toByteArray(IconKeys.PRIVATE_KEY_SIZE);
 
-
         byte[] cipherText = performCipherOperation(
                 Cipher.ENCRYPT_MODE, iv, encryptKey, privateKeyBytes);
 
@@ -91,7 +87,6 @@ public static KeystoreFile create(String password, Bytes privateKey, int n, int
         return createWalletFile(privateKey, cipherText, iv, salt, mac, n, p);
     }
 
-
     private static KeystoreFile createWalletFile(
             Bytes privateKey, byte[] cipherText, byte[] iv, byte[] salt, byte[] mac,
             int n, int p) {

diff --git a/library/src/main/java/foundation/icon/icx/crypto/KeystoreFile.java b/library/src/main/java/foundation/icon/icx/crypto/KeystoreFile.java
@@ -444,5 +444,4 @@ public int hashCode() {
             return result;
         }
     }
-
 }
diff --git a/library/src/main/java/foundation/icon/icx/crypto/LinuxSecureRandom.java b/library/src/main/java/foundation/icon/icx/crypto/LinuxSecureRandom.java
@@ -1,7 +1,10 @@
 package foundation.icon.icx.crypto;
 
-
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.security.Provider;
 import java.security.SecureRandomSpi;
 import java.security.Security;