Merge pull request #1066 from kishansagathiya/small_fix_5

Do empty string checks with .isEmpty() everywhere
ethereum · May 7, 2018 · 4cdc799 · 4cdc799
2 parents 161b2a1 + 4d9edbd
commit 4cdc799
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/ethereumj-core/src/main/java/org/ethereum/config/CommonConfig.java b/ethereumj-core/src/main/java/org/ethereum/config/CommonConfig.java
@@ -197,7 +197,7 @@ protected RocksDbDataSource rocksDbDataSource() {
     public void fastSyncCleanUp() {
         byte[] fastsyncStageBytes = blockchainDB().get(FastSyncManager.FASTSYNC_DB_KEY_SYNC_STAGE);
         if (fastsyncStageBytes == null) return; // no uncompleted fast sync
-        if (!systemProperties().blocksLoader().equals("")) return; // blocks loader enabled
+        if (!systemProperties().blocksLoader().isEmpty()) return; // blocks loader enabled
 
         EthereumListener.SyncState syncStage = EthereumListener.SyncState.values()[fastsyncStageBytes[0]];
 

diff --git a/ethereumj-core/src/main/java/org/ethereum/util/Value.java b/ethereumj-core/src/main/java/org/ethereum/util/Value.java
@@ -271,7 +271,7 @@ public boolean isEmpty() {
         if (isNull()) return true;
         if (isBytes() && asBytes().length == 0) return true;
         if (isList() && asList().isEmpty()) return true;
-        if (isString() && asString().equals("")) return true;
+        if (isString() && asString().isEmpty()) return true;
 
         return false;
     }

diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/GitHubJSONTestSuite.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/GitHubJSONTestSuite.java
@@ -54,7 +54,7 @@ public class GitHubJSONTestSuite {
 
 
     protected static void runGitHubJsonVMTest(String json, String testName) throws ParseException {
-        Assume.assumeFalse("Online test is not available", json.equals(""));
+        Assume.assumeFalse("Online test is not available", json.isEmpty());
 
         JSONParser parser = new JSONParser();
         JSONObject testSuiteObj = (JSONObject) parser.parse(json);
@@ -83,7 +83,7 @@ protected static void runGitHubJsonVMTest(String json, String testName) throws P
     }
 
     public static void runGitHubJsonVMTest(String json) throws ParseException {
-        Assume.assumeFalse("Online test is not available", json.equals(""));
+        Assume.assumeFalse("Online test is not available", json.isEmpty());
 
         JSONParser parser = new JSONParser();
         JSONObject testSuiteObj = (JSONObject) parser.parse(json);
@@ -124,7 +124,7 @@ protected static void runGitHubJsonSingleBlockTest(String json, String testName)
 
 
     protected static void runGitHubJsonBlockTest(String json, Set<String> excluded) throws ParseException, IOException {
-        Assume.assumeFalse("Online test is not available", json.equals(""));
+        Assume.assumeFalse("Online test is not available", json.isEmpty());
 
         BlockTestSuite testSuite = new BlockTestSuite(json);
         Set<String> testCases = testSuite.getTestCases().keySet();

diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/Utils.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/Utils.java
@@ -33,12 +33,12 @@
 public class Utils {
 
     public static byte[] parseVarData(String data){
-        if (data == null || data.equals("")) return EMPTY_BYTE_ARRAY;
+        if (data == null || data.isEmpty()) return EMPTY_BYTE_ARRAY;
 
         byte[] bytes;
         if (data.startsWith("0x")) {
             data = data.substring(2);
-            if (data.equals("")) return EMPTY_BYTE_ARRAY;
+            if (data.isEmpty()) return EMPTY_BYTE_ARRAY;
 
             if (data.length() % 2 == 1) data = "0" + data;
 
@@ -64,24 +64,24 @@ public static byte[] parseData(String data) {
 
     public static byte[] parseNumericData(String data){
 
-        if (data == null || data.equals("")) return EMPTY_BYTE_ARRAY;
+        if (data == null || data.isEmpty()) return EMPTY_BYTE_ARRAY;
         byte[] dataB = unifiedNumericToBigInteger(data).toByteArray();
         return ByteUtil.stripLeadingZeroes(dataB);
     }
 
     public static long parseLong(String data) {
         boolean hex = data.startsWith("0x");
         if (hex) data = data.substring(2);
-        if (data.equals("")) return 0;
+        if (data.isEmpty()) return 0;
         return new BigInteger(data, hex ? 16 : 10).longValue();
     }
 
     public static byte parseByte(String data) {
         if (data.startsWith("0x")) {
             data = data.substring(2);
-            return data.equals("") ? 0 : Byte.parseByte(data, 16);
+            return data.isEmpty() ? 0 : Byte.parseByte(data, 16);
         } else
-            return data.equals("") ? 0 : Byte.parseByte(data);
+            return data.isEmpty() ? 0 : Byte.parseByte(data);
     }