Skip to content

Commit 2b43d8e

Browse files
AhnSinYongAhnSinYong
committed
- Unification with variable name logger
- Change logger variable declaration to annotation - Change from test root log level error to debug
1 parent 4d23a5d commit 2b43d8e

75 files changed

Lines changed: 170 additions & 323 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎lombok.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lombok.log.fieldName=logger

‎src/main/java/org/tron/common/application/ApplicationImpl.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.tron.common.application;
22

3-
import org.slf4j.Logger;
4-
import org.slf4j.LoggerFactory;
3+
import lombok.extern.slf4j.Slf4j;
54

65
import org.tron.core.db.BlockStore;
76
import org.tron.core.db.Manager;
@@ -11,9 +10,8 @@
1110
import org.tron.core.net.node.NodeImpl;
1211
import org.tron.core.config.args.Args;
1312

13+
@Slf4j
1414
public class ApplicationImpl implements Application {
15-
16-
private static final Logger logger = LoggerFactory.getLogger("ApplicationImpl");
1715
private Node p2pNode;
1816
private BlockStore blockStoreDb;
1917
private ServiceContainer services;

‎src/main/java/org/tron/common/application/ServiceContainer.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
package org.tron.common.application;
1616

1717
import java.util.ArrayList;
18-
import org.slf4j.Logger;
19-
import org.slf4j.LoggerFactory;
18+
19+
import lombok.extern.slf4j.Slf4j;
2020
import org.tron.core.config.args.Args;
2121

22+
@Slf4j
2223
public class ServiceContainer {
23-
24-
private static final Logger logger = LoggerFactory.getLogger("Services");
2524
private ArrayList<Service> services;
2625

2726
public ServiceContainer() {

‎src/main/java/org/tron/common/crypto/ECKey.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
import java.util.Arrays;
4141
import javax.annotation.Nullable;
4242
import javax.crypto.KeyAgreement;
43-
import org.slf4j.Logger;
44-
import org.slf4j.LoggerFactory;
43+
44+
import lombok.extern.slf4j.Slf4j;
4545
import org.spongycastle.asn1.ASN1InputStream;
4646
import org.spongycastle.asn1.ASN1Integer;
4747
import org.spongycastle.asn1.DLSequence;
@@ -77,6 +77,7 @@
7777
import org.tron.common.crypto.jce.TronCastleProvider;
7878
import org.tron.common.utils.ByteUtil;
7979

80+
@Slf4j
8081
public class ECKey implements Serializable {
8182

8283
/**
@@ -95,7 +96,6 @@ public class ECKey implements Serializable {
9596
*/
9697

9798
public static final BigInteger HALF_CURVE_ORDER;
98-
private static final Logger logger = LoggerFactory.getLogger(ECKey.class);
9999
private static final BigInteger SECP256K1N =
100100
new BigInteger("fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141", 16);
101101
private static final SecureRandom secureRandom;

‎src/main/java/org/tron/common/crypto/Hash.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@
2424
import java.security.NoSuchAlgorithmException;
2525
import java.security.Provider;
2626
import java.security.Security;
27-
import org.slf4j.Logger;
28-
import org.slf4j.LoggerFactory;
27+
import lombok.extern.slf4j.Slf4j;
2928
import org.tron.common.crypto.jce.TronCastleProvider;
3029

30+
@Slf4j
3131
public class Hash {
32-
33-
private static final Logger LOG = LoggerFactory.getLogger(Hash.class);
3432
private static final Provider CRYPTO_PROVIDER;
3533

3634
private static final String HASH_256_ALGORITHM_NAME;
@@ -46,7 +44,7 @@ public class Hash {
4644
try {
4745
sha256digest = MessageDigest.getInstance("SHA-256");
4846
} catch (NoSuchAlgorithmException e) {
49-
LOG.error("Can't initialize HashUtils", e);
47+
logger.error("Can't initialize HashUtils", e);
5048
throw new RuntimeException(e); // Can't happen.
5149
}
5250

@@ -68,7 +66,7 @@ public static byte[] sha3(byte[] input) {
6866
digest.update(input);
6967
return digest.digest();
7068
} catch (NoSuchAlgorithmException e) {
71-
LOG.error("Can't find such algorithm", e);
69+
logger.error("Can't find such algorithm", e);
7270
throw new RuntimeException(e);
7371
}
7472

@@ -83,7 +81,7 @@ public static byte[] sha3(byte[] input1, byte[] input2) {
8381
digest.update(input2, 0, input2.length);
8482
return digest.digest();
8583
} catch (NoSuchAlgorithmException e) {
86-
LOG.error("Can't find such algorithm", e);
84+
logger.error("Can't find such algorithm", e);
8785
throw new RuntimeException(e);
8886
}
8987
}
@@ -104,7 +102,7 @@ public static byte[] sha3(byte[] input, int start, int length) {
104102
digest.update(input, start, length);
105103
return digest.digest();
106104
} catch (NoSuchAlgorithmException e) {
107-
LOG.error("Can't find such algorithm", e);
105+
logger.error("Can't find such algorithm", e);
108106
throw new RuntimeException(e);
109107
}
110108
}
@@ -117,7 +115,7 @@ public static byte[] sha512(byte[] input) {
117115
digest.update(input);
118116
return digest.digest();
119117
} catch (NoSuchAlgorithmException e) {
120-
LOG.error("Can't find such algorithm", e);
118+
logger.error("Can't find such algorithm", e);
121119
throw new RuntimeException(e);
122120
}
123121
}

‎src/main/java/org/tron/common/crypto/SymmEncoder.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,23 @@
33
import javax.crypto.Cipher;
44
import javax.crypto.SecretKey;
55
import javax.crypto.spec.SecretKeySpec;
6-
import org.slf4j.Logger;
7-
import org.slf4j.LoggerFactory;
86

9-
public class SymmEncoder {
10-
11-
private static final Logger LOG = LoggerFactory.getLogger(SymmEncoder.class);
7+
import lombok.extern.slf4j.Slf4j;
128

9+
@Slf4j
10+
public class SymmEncoder {
1311
public static SecretKey restoreSecretKey(byte[] secretBytes, String algorithm) {
1412
SecretKey secretKey = new SecretKeySpec(secretBytes, algorithm);
1513
return secretKey;
1614
}
1715

1816
public static byte[] AES128EcbEnc(byte[] plain, byte[] aesKey) {
1917
if (aesKey == null || aesKey.length != 16) {
20-
LOG.error("AesKey need 16 bytes !!!");
18+
logger.error("AesKey need 16 bytes !!!");
2119
return null;
2220
}
2321
if (plain == null || (plain.length & 0x0F) != 0) {
24-
LOG.error("The length of encoded must be a multiple of 16 !!!");
22+
logger.error("The length of encoded must be a multiple of 16 !!!");
2523
return null;
2624
}
2725

@@ -31,11 +29,11 @@ public static byte[] AES128EcbEnc(byte[] plain, byte[] aesKey) {
3129

3230
public static byte[] AES128EcbDec(byte[] encoded, byte[] aesKey) {
3331
if (aesKey == null || aesKey.length != 16) {
34-
LOG.error("AesKey need 16 bytes !!!");
32+
logger.error("AesKey need 16 bytes !!!");
3533
return null;
3634
}
3735
if (encoded == null || (encoded.length & 0x0F) != 0) {
38-
LOG.error("The length of encoded must be a multiple of 16 !!!");
36+
logger.error("The length of encoded must be a multiple of 16 !!!");
3937
return null;
4038
}
4139

‎src/main/java/org/tron/common/overlay/node/GossipLocalNode.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
import java.util.concurrent.ThreadPoolExecutor;
2222
import java.util.concurrent.TimeUnit;
2323
import java.util.stream.Collectors;
24-
import org.slf4j.Logger;
25-
import org.slf4j.LoggerFactory;
24+
import lombok.extern.slf4j.Slf4j;
2625
import org.tron.core.config.args.Args;
2726
import org.tron.core.net.peer.PeerConnection;
2827
import org.tron.core.net.peer.PeerConnectionDelegate;
@@ -34,10 +33,8 @@
3433
import rx.Subscription;
3534
import rx.subscriptions.CompositeSubscription;
3635

36+
@Slf4j
3737
public class GossipLocalNode implements LocalNode {
38-
39-
private static final Logger logger = LoggerFactory.getLogger("GossipLocalNode");
40-
4138
private Cluster cluster = null;
4239

4340
private PeerConnectionDelegate peerDel;

‎src/main/java/org/tron/common/storage/leveldb/LevelDbDataSourceImpl.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,19 @@
2727
import java.util.Set;
2828
import java.util.concurrent.locks.ReadWriteLock;
2929
import java.util.concurrent.locks.ReentrantReadWriteLock;
30+
import lombok.extern.slf4j.Slf4j;
3031
import org.iq80.leveldb.CompressionType;
3132
import org.iq80.leveldb.DB;
3233
import org.iq80.leveldb.DBException;
3334
import org.iq80.leveldb.DBIterator;
3435
import org.iq80.leveldb.Options;
3536
import org.iq80.leveldb.WriteBatch;
36-
import org.slf4j.Logger;
37-
import org.slf4j.LoggerFactory;
3837
import org.tron.common.storage.DbSourceInter;
3938
import org.tron.common.utils.FileUtil;
4039
import org.tron.core.config.args.Args;
4140

41+
@Slf4j
4242
public class LevelDbDataSourceImpl implements DbSourceInter<byte[]> {
43-
44-
private static final Logger logger = LoggerFactory.getLogger("dbStore");
4543
String dataBaseName;
4644
DB database;
4745
boolean alive;

‎src/main/java/org/tron/common/utils/ByteArray.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,17 @@
2020

2121
import com.google.common.primitives.Ints;
2222
import com.google.common.primitives.Longs;
23+
import lombok.extern.slf4j.Slf4j;
2324
import org.apache.commons.lang3.ArrayUtils;
2425
import org.apache.commons.lang3.StringUtils;
25-
import org.slf4j.Logger;
26-
import org.slf4j.LoggerFactory;
2726
import org.spongycastle.util.encoders.Hex;
28-
2927
import java.io.ByteArrayOutputStream;
3028
import java.io.IOException;
3129
import java.io.ObjectOutputStream;
3230
import java.math.BigInteger;
3331

32+
@Slf4j
3433
public class ByteArray {
35-
36-
private static final Logger logger = LoggerFactory.getLogger("ByteArray");
37-
3834
public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
3935

4036
public static String toHexString(byte[] data) {

‎src/main/java/org/tron/common/utils/RandomGenerator.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,10 @@
2424
package org.tron.common.utils;
2525

2626
import java.util.List;
27-
import org.slf4j.Logger;
28-
import org.slf4j.LoggerFactory;
27+
import lombok.extern.slf4j.Slf4j;
2928

29+
@Slf4j
3030
public class RandomGenerator<T> {
31-
32-
private static final Logger logger = LoggerFactory.getLogger(RandomGenerator.class);
33-
3431
private static long RANDOM_GENERATOR_NUMBER = 2685821657736338717L;
3532

3633
public List<T> shuffle(List<T> list, long time) {

0 commit comments

Comments
 (0)