Merge remote-tracking branch 'lfcnassif/#2371_RenameCrypto'

sepinf-inc · Dec 30, 2024 · 678d90d · 678d90d
2 parents 9919563 + 274c3fb
commit 678d90d
Show file tree

Hide file tree

Showing 21 changed files with 68 additions and 54 deletions.
diff --git a/iped-app/resources/config/conf/RegexConfig.txt b/iped-app/resources/config/conf/RegexConfig.txt
diff --git a/iped-app/resources/config/conf/metadataTypes.txt b/iped-app/resources/config/conf/metadataTypes.txt
@@ -1662,9 +1662,9 @@ Regex:BR_CPF = java.lang.String
 Regex:BR_PISPASEP = java.lang.String
 Regex:BR_TITULO_ELEITOR = java.lang.String
 Regex:CREDIT_CARD = java.lang.String
-Regex:CRIPTOCOIN_BITCOIN_ADDRESS = java.lang.String
-Regex:CRIPTOCOIN_MONERO = java.lang.String
-Regex:CRIPTO_POSSIBLE_SEED_PHRASE_EN = java.lang.String
+Regex:CRYPTOCOIN_BITCOIN_ADDRESS = java.lang.String
+Regex:CRYPTOCOIN_MONERO = java.lang.String
+Regex:CRYPTO_POSSIBLE_SEED_PHRASE_EN = java.lang.String
 Regex:EMAIL = java.lang.String
 Regex:IP = java.lang.String
 Regex:MAC_ADDRESS = java.lang.String

diff --git a/...x_validators/CriptoSeedPhraseValidator.js → ...x_validators/CryptoSeedPhraseValidator.js b/...x_validators/CriptoSeedPhraseValidator.js → ...x_validators/CryptoSeedPhraseValidator.js
@@ -11,7 +11,7 @@
  * @returns String array with at least one regex name to be validated
  */
 function getRegexNames() {
-	return ["CRIPTO_POSSIBLE_SEED_PHRASE_EN","CRIPTO_POSSIBLE_SEED_PHRASE_PT"];
+	return ["CRYPTO_POSSIBLE_SEED_PHRASE_EN","CRYPTO_POSSIBLE_SEED_PHRASE_PT"];
 }
 
 /**

diff --git a/...r/cripto/AltcoinBase58CheckValidator.java → ...r/crypto/AltcoinBase58CheckValidator.java b/...r/cripto/AltcoinBase58CheckValidator.java → ...r/crypto/AltcoinBase58CheckValidator.java
@@ -1,4 +1,4 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

diff --git a/...or/cripto/BCHAddressValidatorService.java → ...or/crypto/BCHAddressValidatorService.java b/...or/cripto/BCHAddressValidatorService.java → ...or/crypto/BCHAddressValidatorService.java
@@ -1,4 +1,4 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import java.io.File;
 import java.util.Arrays;
@@ -34,7 +34,7 @@ public void init(File confDir) {
 
     @Override
     public List<String> getRegexNames() {
-        return Arrays.asList("CRIPTOCOIN_BITCOIN_CASH_CASHADDR");
+        return Arrays.asList("CRYPTOCOIN_BITCOIN_CASH_CASHADDR");
     }
 
     @Override

diff --git a/...idator/cripto/Base58CheckedValidator.java → ...idator/crypto/Base58CheckedValidator.java b/...idator/cripto/Base58CheckedValidator.java → ...idator/crypto/Base58CheckedValidator.java
@@ -1,4 +1,4 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import java.io.IOException;
 import java.security.MessageDigest;
@@ -7,7 +7,7 @@
 
 /**
  * Utility class for validation of Base58Checked values used in various
- * criptocurrencies
+ * cryptocurrencies
  * 
  * @author Fabio Melo Pfeifer <[email protected]>
  *

diff --git a/...idator/cripto/Bech32AddressValidator.java → ...idator/crypto/Bech32AddressValidator.java b/...idator/cripto/Bech32AddressValidator.java → ...idator/crypto/Bech32AddressValidator.java
@@ -1,4 +1,4 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 public class Bech32AddressValidator {
 

diff --git a/...ripto/BitcoinAddressValidatorService.java → ...rypto/BitcoinAddressValidatorService.java b/...ripto/BitcoinAddressValidatorService.java → ...rypto/BitcoinAddressValidatorService.java
@@ -1,4 +1,4 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import java.io.File;
 import java.util.Arrays;
@@ -39,9 +39,9 @@ public void init(File confDir) {
 
     @Override
     public List<String> getRegexNames() {
-        return Arrays.asList("CRIPTOCOIN_BITCOIN_ADDRESS", "CRIPTOCOIN_BITCOIN_BIP38_ENC_PRIV_K",
-                "CRIPTOCOIN_BITCOIN_WIF_PRIV_K_UNC_PUB_K", "CRIPTOCOIN_BITCOIN_WIF_PRIV_K_COMP_PUB_K",
-                "CRIPTOCOIN_BITCOIN_BIP32_HD_XPRV_KEY", "CRIPTOCOIN_BITCOIN_BIP32_HD_XPUB_KEY");
+        return Arrays.asList("CRYPTOCOIN_BITCOIN_ADDRESS", "CRYPTOCOIN_BITCOIN_BIP38_ENC_PRIV_K",
+                "CRYPTOCOIN_BITCOIN_WIF_PRIV_K_UNC_PUB_K", "CRYPTOCOIN_BITCOIN_WIF_PRIV_K_COMP_PUB_K",
+                "CRYPTOCOIN_BITCOIN_BIP32_HD_XPRV_KEY", "CRYPTOCOIN_BITCOIN_BIP32_HD_XPUB_KEY");
     }
 
     @Override

diff --git a/...r/cripto/DashAddressValidatorService.java → ...r/crypto/DashAddressValidatorService.java b/...r/cripto/DashAddressValidatorService.java → ...r/crypto/DashAddressValidatorService.java
@@ -1,4 +1,4 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import java.io.File;
 import java.util.Arrays;
@@ -23,7 +23,7 @@ public void init(File confDir) {
 
     @Override
     public List<String> getRegexNames() {
-        return Arrays.asList("CRIPTOCOIN_DASH");
+        return Arrays.asList("CRYPTOCOIN_DASH");
     }
 
     @Override

diff --git a/...ipto/DogeCoinAddressValidatorService.java → ...ypto/DogeCoinAddressValidatorService.java b/...ipto/DogeCoinAddressValidatorService.java → ...ypto/DogeCoinAddressValidatorService.java
@@ -1,4 +1,4 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import java.io.File;
 import java.util.Arrays;
@@ -24,7 +24,7 @@ public void init(File confDir) {
 
     @Override
     public List<String> getRegexNames() {
-        return Arrays.asList("CRIPTOCOIN_DOGECOIN");
+        return Arrays.asList("CRYPTOCOIN_DOGECOIN");
     }
 
     @Override

diff --git a/...ipto/EthereumAddressValidatorService.java → ...ypto/EthereumAddressValidatorService.java b/...ipto/EthereumAddressValidatorService.java → ...ypto/EthereumAddressValidatorService.java
@@ -1,4 +1,4 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import java.io.File;
 import java.security.MessageDigest;
@@ -32,7 +32,7 @@ public void init(File confDir) {
 
     @Override
     public List<String> getRegexNames() {
-        return Arrays.asList("CRIPTOCOIN_ETHEREUM");
+        return Arrays.asList("CRYPTOCOIN_ETHEREUM");
     }
 
     @Override

diff --git a/...ipto/LiteCoinAddressValidatorService.java → ...ypto/LiteCoinAddressValidatorService.java b/...ipto/LiteCoinAddressValidatorService.java → ...ypto/LiteCoinAddressValidatorService.java
@@ -1,4 +1,4 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import java.io.File;
 import java.util.Arrays;
@@ -35,7 +35,7 @@ public void init(File confDir) {
 
     @Override
     public List<String> getRegexNames() {
-        return Arrays.asList("CRIPTOCOIN_LITECOIN");
+        return Arrays.asList("CRYPTOCOIN_LITECOIN");
     }
 
     @Override

diff --git a/...cripto/RippleAddressValidatorService.java → ...crypto/RippleAddressValidatorService.java b/...cripto/RippleAddressValidatorService.java → ...crypto/RippleAddressValidatorService.java
@@ -1,4 +1,4 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import java.io.File;
 import java.util.Arrays;
@@ -17,7 +17,7 @@ public void init(File confDir) {
 
     @Override
     public List<String> getRegexNames() {
-        return Arrays.asList("CRIPTOCOIN_RIPPLE");
+        return Arrays.asList("CRYPTOCOIN_RIPPLE");
     }
 
     @Override

diff --git a/...-engine/src/main/resources/META-INF/services/iped.engine.task.regex.RegexValidatorService b/...-engine/src/main/resources/META-INF/services/iped.engine.task.regex.RegexValidatorService
@@ -7,15 +7,15 @@ iped.engine.task.regex.validator.BoletoRegexValidatorService
 iped.engine.task.regex.validator.TituloEleitorRegexValidatorService
 iped.engine.task.regex.validator.CreditCardRegexValidatorService
 iped.engine.task.regex.validator.ScriptValidatorService
-iped.engine.task.regex.validator.cripto.BitcoinAddressValidatorService
-iped.engine.task.regex.validator.cripto.BCHAddressValidatorService
-iped.engine.task.regex.validator.cripto.EthereumAddressValidatorService
-iped.engine.task.regex.validator.cripto.RippleAddressValidatorService
+iped.engine.task.regex.validator.crypto.BitcoinAddressValidatorService
+iped.engine.task.regex.validator.crypto.BCHAddressValidatorService
+iped.engine.task.regex.validator.crypto.EthereumAddressValidatorService
+iped.engine.task.regex.validator.crypto.RippleAddressValidatorService
 iped.engine.task.regex.validator.PhoneRegexValidatorService
 iped.engine.task.regex.validator.PlacaRegexValidatorService
 iped.engine.task.regex.validator.IPLRegexValidatorService
 iped.engine.task.regex.validator.FacebookContactValidatorService
 iped.engine.task.regex.validator.RIFRegexValidatorService
-iped.engine.task.regex.validator.cripto.DogeCoinAddressValidatorService
-iped.engine.task.regex.validator.cripto.DashAddressValidatorService
-iped.engine.task.regex.validator.cripto.LiteCoinAddressValidatorService
+iped.engine.task.regex.validator.crypto.DogeCoinAddressValidatorService
+iped.engine.task.regex.validator.crypto.DashAddressValidatorService
+iped.engine.task.regex.validator.crypto.LiteCoinAddressValidatorService
diff --git a/...ripto/BCHAddressValidatorServiceTest.java → ...rypto/BCHAddressValidatorServiceTest.java b/...ripto/BCHAddressValidatorServiceTest.java → ...rypto/BCHAddressValidatorServiceTest.java
@@ -1,10 +1,12 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import iped.engine.task.regex.validator.crypto.BCHAddressValidatorService;
+
 public class BCHAddressValidatorServiceTest {
 
     @Test

diff --git a/...o/BitcoinAddressValidatorServiceTest.java → ...o/BitcoinAddressValidatorServiceTest.java b/...o/BitcoinAddressValidatorServiceTest.java → ...o/BitcoinAddressValidatorServiceTest.java
@@ -1,10 +1,12 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import iped.engine.task.regex.validator.crypto.BitcoinAddressValidatorService;
+
 public class BitcoinAddressValidatorServiceTest {
 
     BitcoinAddressValidatorService service = new BitcoinAddressValidatorService();

diff --git a/...ipto/DashAddressValidatorServiceTest.java → ...ypto/DashAddressValidatorServiceTest.java b/...ipto/DashAddressValidatorServiceTest.java → ...ypto/DashAddressValidatorServiceTest.java
@@ -1,10 +1,12 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import iped.engine.task.regex.validator.crypto.DashAddressValidatorService;
+
 public class DashAddressValidatorServiceTest {
 
     @Test

diff --git a/.../DogeCoinAddressValidatorServiceTest.java → .../DogeCoinAddressValidatorServiceTest.java b/.../DogeCoinAddressValidatorServiceTest.java → .../DogeCoinAddressValidatorServiceTest.java
@@ -1,10 +1,12 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import iped.engine.task.regex.validator.crypto.DogeCoinAddressValidatorService;
+
 public class DogeCoinAddressValidatorServiceTest {
 
     @Test

diff --git a/.../EthereumAddressValidatorServiceTest.java → .../EthereumAddressValidatorServiceTest.java b/.../EthereumAddressValidatorServiceTest.java → .../EthereumAddressValidatorServiceTest.java
@@ -1,9 +1,11 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
+import iped.engine.task.regex.validator.crypto.EthereumAddressValidatorService;
+
 public class EthereumAddressValidatorServiceTest {
 
     EthereumAddressValidatorService service = new EthereumAddressValidatorService();

diff --git a/.../LiteCoinAddressValidatorServiceTest.java → .../LiteCoinAddressValidatorServiceTest.java b/.../LiteCoinAddressValidatorServiceTest.java → .../LiteCoinAddressValidatorServiceTest.java
@@ -1,10 +1,12 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import iped.engine.task.regex.validator.crypto.LiteCoinAddressValidatorService;
+
 public class LiteCoinAddressValidatorServiceTest {
 
     @Test

diff --git a/...to/RippleAddressValidatorServiceTest.java → ...to/RippleAddressValidatorServiceTest.java b/...to/RippleAddressValidatorServiceTest.java → ...to/RippleAddressValidatorServiceTest.java
@@ -1,10 +1,12 @@
-package iped.engine.task.regex.validator.cripto;
+package iped.engine.task.regex.validator.crypto;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import iped.engine.task.regex.validator.crypto.RippleAddressValidatorService;
+
 public class RippleAddressValidatorServiceTest {
     RippleAddressValidatorService service = new RippleAddressValidatorService();