Skip to content

Commit 7417a6d

Browse files
Merge pull request #12 from brenoepics/main
refactor: code cleanup
2 parents 7ceeccc + 97257f6 commit 7417a6d

Some content is hidden

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

46 files changed

+2244
-2258
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@ replay_pid*
3333

3434
# Other
3535

36-
client_java
36+
client_java
37+
/.idea

docs/content/_index.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,14 @@ Step 2. Add the dependency
135135
```java
136136
// You can import the class or use the full path
137137

138-
import io.github.multiform_validator.CnpjValidator;
138+
import io.github.multiform_validator.identity.CnpjValidator;
139139

140140
public class Main {
141-
public static void main(String[] args) {
142-
String cnpjTrue = "69.807.668/0001-41";
143-
String cnpjFalse = "61.807.661/0001-48";
144-
System.out.println(CnpjValidator.cnpjIsValid(cnpjTrue)); // true
145-
System.out.println(CnpjValidator.cnpjIsValid(cnpjFalse)); // false
146-
}
141+
public static void main(String[] args) {
142+
String cnpjTrue = "69.807.668/0001-41";
143+
String cnpjFalse = "61.807.661/0001-48";
144+
System.out.println(CnpjValidator.cnpjIsValid(cnpjTrue)); // true
145+
System.out.println(CnpjValidator.cnpjIsValid(cnpjFalse)); // false
146+
}
147147
}
148148
```

docs/content/classes/CnpjValidator.md

+16-16
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ a `String` as a parameter and returns a `boolean` value.
66
```java
77
// You can import the class or use the full path
88

9-
import io.github.multiform_validator.CnpjValidator;
9+
import io.github.multiform_validator.identity.CnpjValidator;
1010

1111
public class Main {
12-
public static void main(String[] args) {
13-
System.out.println(cnpjIsTrue()); // true
14-
System.out.println(cnpjIsFalse()); // false
15-
}
16-
17-
public static boolean cnpjIsTrue() {
18-
String cnpjTrue = "69.807.668/0001-41";
19-
return CnpjValidator.cnpjIsValid(cnpjTrue);
20-
}
21-
22-
public static boolean cnpjIsFalse() {
23-
String cnpjFalse = "61.807.661/0001-48";
24-
return CnpjValidator.cnpjIsValid(cnpjFalse);
25-
}
12+
public static void main(String[] args) {
13+
System.out.println(cnpjIsTrue()); // true
14+
System.out.println(cnpjIsFalse()); // false
15+
}
16+
17+
public static boolean cnpjIsTrue() {
18+
String cnpjTrue = "69.807.668/0001-41";
19+
return CnpjValidator.cnpjIsValid(cnpjTrue);
20+
}
21+
22+
public static boolean cnpjIsFalse() {
23+
String cnpjFalse = "61.807.661/0001-48";
24+
return CnpjValidator.cnpjIsValid(cnpjFalse);
25+
}
2626
}
2727
```
2828

@@ -33,4 +33,4 @@ public class Main {
3333
- [FileValidator](https://multiform-validator.github.io/java/classes/FileValidator)
3434
- [Utils](https://multiform-validator.github.io/java/classes/Utils)
3535
- [Validate](https://multiform-validator.github.io/java/classes/Validate)
36-
- [Validator](https://multiform-validator.github.io/java/classes/Validator)
36+
- [Validator](https://multiform-validator.github.io/java/classes/Validator)

docs/content/classes/CpfValidator.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ a `String` as a parameter and returns a `boolean` value.
66
```java
77
// You can also import the method as static or use the full path
88

9-
import static io.github.multiform_validator.CpfValidator.cpfIsValid;
9+
import static io.github.multiform_validator.identity.CpfValidator.cpfIsValid;
1010

1111
public class Main {
12-
public static void main(String[] args) {
13-
String cpfTrue = "123.456.789-09";
14-
String cpfFalse = "123.456.789-10";
15-
System.out.println(cpfIsValid(cpfTrue)); // true
16-
System.out.println(cpfIsValid(cpfFalse)); // false
17-
}
12+
public static void main(String[] args) {
13+
String cpfTrue = "123.456.789-09";
14+
String cpfFalse = "123.456.789-10";
15+
System.out.println(cpfIsValid(cpfTrue)); // true
16+
System.out.println(cpfIsValid(cpfFalse)); // false
17+
}
1818
}
1919
```
2020

@@ -25,4 +25,4 @@ public class Main {
2525
- [FileValidator](https://multiform-validator.github.io/java/classes/FileValidator)
2626
- [Utils](https://multiform-validator.github.io/java/classes/Utils)
2727
- [Validate](https://multiform-validator.github.io/java/classes/Validate)
28-
- [Validator](https://multiform-validator.github.io/java/classes/Validator)
28+
- [Validator](https://multiform-validator.github.io/java/classes/Validator)

docs/content/classes/CreditCardValidator.md

+19-19
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,34 @@ and `identifyCreditCard`.
66
### isCreditCardValid
77

88
```java
9-
import io.github.multiform_validator.CreditCardValidator;
9+
import io.github.multiform_validator.identity.CreditCardValidator;
1010

1111
public class Main {
12-
public static void main(String[] args) {
13-
valid();
14-
invalid();
15-
}
16-
17-
private static void valid() {
18-
System.out.println(CreditCardValidator.isCreditCardValid("4532 8770 0040 4166")); // true
19-
}
20-
21-
private static void invalid() {
22-
System.out.println(CreditCardValidator.isCreditCardValid("4532 8770 0040 4167")); // false
23-
}
12+
public static void main(String[] args) {
13+
valid();
14+
invalid();
15+
}
16+
17+
private static void valid() {
18+
System.out.println(CreditCardValidator.isCreditCardValid("4532 8770 0040 4166")); // true
19+
}
20+
21+
private static void invalid() {
22+
System.out.println(CreditCardValidator.isCreditCardValid("4532 8770 0040 4167")); // false
23+
}
2424
}
2525
```
2626

2727
### identifyCreditCard
2828

2929
```java
30-
import io.github.multiform_validator.CreditCardValidator;
30+
import io.github.multiform_validator.identity.CreditCardValidator;
3131

3232
public class Main {
33-
public static void main(String[] args) {
34-
String creditCard = "4532 8770 0040 4166";
35-
System.out.println(CreditCardValidator.identifyCreditCard(creditCard)); // Visa
36-
}
33+
public static void main(String[] args) {
34+
String creditCard = "4532 8770 0040 4166";
35+
System.out.println(CreditCardValidator.identifyCreditCard(creditCard)); // Visa
36+
}
3737
}
3838
```
3939

@@ -44,4 +44,4 @@ public class Main {
4444
- [FileValidator](https://multiform-validator.github.io/java/classes/FileValidator)
4545
- [Utils](https://multiform-validator.github.io/java/classes/Utils)
4646
- [Validate](https://multiform-validator.github.io/java/classes/Validate)
47-
- [Validator](https://multiform-validator.github.io/java/classes/Validator)
47+
- [Validator](https://multiform-validator.github.io/java/classes/Validator)

docs/content/classes/Utils.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ methods:
1313
### getOnlyEmail
1414

1515
```java
16-
import io.github.multiform_validator.Utils;
16+
1717

1818
public class Main {
19-
public static void main(String[] args) {
20-
String msg1 = "This is a message example with [email protected] email to test";
21-
System.out.println(Utils.getOnlyEmail(msg1, null)); // [email protected]
22-
23-
String msg2 = "Example two [email protected] and [email protected]";
24-
// With options
25-
Utils.GetOnlyEmailOptionsParams options = new Utils.GetOnlyEmailOptionsParams();
26-
options.setMultiple(true);
27-
System.out.println(Utils.getOnlyEmailWithOptions(msg2, options)); // [[email protected], [email protected]]
28-
}
19+
public static void main(String[] args) {
20+
String msg1 = "This is a message example with [email protected] email to test";
21+
System.out.println(Utils.getOnlyEmail(msg1, null)); // [email protected]
22+
23+
String msg2 = "Example two [email protected] and [email protected]";
24+
// With options
25+
Utils.OnlyEmailParams options = new Utils.OnlyEmailParams();
26+
options.setMultiple(true);
27+
System.out.println(Utils.getOnlyEmailWithOptions(msg2, options)); // [[email protected], [email protected]]
28+
}
2929
}
3030
```
3131

@@ -36,4 +36,4 @@ public class Main {
3636
- [CreditCardValidator](https://multiform-validator.github.io/java/classes/CreditCardValidator)
3737
- [FileValidator](https://multiform-validator.github.io/java/classes/FileValidator)
3838
- [Validate](https://multiform-validator.github.io/java/classes/Validate)
39-
- [Validator](https://multiform-validator.github.io/java/classes/Validator)
39+
- [Validator](https://multiform-validator.github.io/java/classes/Validator)

docs/content/classes/Validate.md

+33-34
Original file line numberDiff line numberDiff line change
@@ -23,49 +23,48 @@ The `Validate` class is a utility class with some methods to validate data. It h
2323
### validateEmail
2424

2525
```java
26-
import io.github.multiform_validator.Validate;
27-
import io.github.multiform_validator.Validate.ValidateEmailOptionsParams;
26+
import io.github.multiform_validator.format.EmailValidator;
2827

2928
import java.util.Collections;
3029

3130
public class Main {
32-
public static void main(String[] args) {
33-
validateEmailExample();
34-
}
31+
public static void main(String[] args) {
32+
validateEmailExample();
33+
}
3534

36-
public static void validateEmailExample() {
37-
// IMPORTANT: validDomains can not be used with validDomainsList, you can use only one of them
35+
public static void validateEmailExample() {
36+
// IMPORTANT: validDomains can not be used with validDomainsList, you can use only one of them
3837

39-
// Basic email validation
40-
boolean isValid = Validate.validateEmail("[email protected]");
41-
System.out.println("Is valid: " + isValid); // Expected: true
38+
// Basic email validation
39+
boolean isValid = EmailValidator.validateEmail("[email protected]");
40+
System.out.println("Is valid: " + isValid); // Expected: true
4241

43-
// Email validation with options: maxLength
44-
ValidateEmailOptionsParams optionsMaxLength = new ValidateEmailOptionsParams();
45-
optionsMaxLength.setMaxLength(10); // Setting max length to 10, which should fail for longer emails
46-
boolean isValidMaxLength = Validate.validateEmail("[email protected]", optionsMaxLength);
47-
System.out.println("Is valid with maxLength: " + isValidMaxLength); // Expected: false
42+
// Email validation with options: maxLength
43+
EmailParams optionsMaxLength = new EmailValidator.EmailParams();
44+
optionsMaxLength.setMaxLength(10); // Setting max length to 10, which should fail for longer emails
45+
boolean isValidMaxLength = EmailValidator.validateEmail("[email protected]", optionsMaxLength);
46+
System.out.println("Is valid with maxLength: " + isValidMaxLength); // Expected: false
4847

49-
// Email validation with options: country specific
50-
ValidateEmailOptionsParams optionsCountry = new ValidateEmailOptionsParams();
51-
optionsCountry.setCountry("us"); // Expecting an email from the US
52-
boolean isNotValidCountry = Validate.validateEmail("[email protected]", optionsCountry);
53-
boolean isValidCountry = Validate.validateEmail("[email protected]", optionsCountry);
54-
System.out.println("Is not valid with country: " + isNotValidCountry); // Expected: false
55-
System.out.println("Is valid with country: " + isValidCountry); // Expected: true
48+
// Email validation with options: country specific
49+
EmailParams optionsCountry = new EmailParams();
50+
optionsCountry.setCountry("us"); // Expecting an email from the US
51+
boolean isNotValidCountry = EmailValidator.validateEmail("[email protected]", optionsCountry);
52+
boolean isValidCountry = EmailValidator.validateEmail("[email protected]", optionsCountry);
53+
System.out.println("Is not valid with country: " + isNotValidCountry); // Expected: false
54+
System.out.println("Is valid with country: " + isValidCountry); // Expected: true
5655

57-
// Email validation with options: validDomains
58-
ValidateEmailOptionsParams optionsValidDomains = new ValidateEmailOptionsParams();
59-
optionsValidDomains.setValidDomains(true); // Only allow certain domains (implementation specific)
60-
boolean isValidValidDomains = Validate.validateEmail("[email protected]", optionsValidDomains);
61-
System.out.println("Is valid with validDomains: " + isValidValidDomains); // Expected: true
56+
// Email validation with options: validDomains
57+
EmailParams optionsValidDomains = new EmailParams();
58+
optionsValidDomains.setValidDomains(true); // Only allow certain domains (implementation specific)
59+
boolean isValidValidDomains = EmailValidator.validateEmail("[email protected]", optionsValidDomains);
60+
System.out.println("Is valid with validDomains: " + isValidValidDomains); // Expected: true
6261

63-
// Email validation with options: validDomainsList
64-
ValidateEmailOptionsParams optionsValidDomainsList = new ValidateEmailOptionsParams();
65-
optionsValidDomainsList.setValidDomainsList(Collections.singletonList("specificdomain.com")); // Adding a specific domain to the list
66-
boolean isValidValidDomainsList = Validate.validateEmail("[email protected]", optionsValidDomainsList);
67-
System.out.println("Is valid with validDomainsList: " + isValidValidDomainsList); // Expected: true
68-
}
62+
// Email validation with options: validDomainsList
63+
EmailValidator.EmailParams optionsValidDomainsList = new EmailValidator.EmailParams();
64+
optionsValidDomainsList.setValidDomainsList(Collections.singletonList("specificdomain.com")); // Adding a specific domain to the list
65+
boolean isValidValidDomainsList = EmailValidator.validateEmail("[email protected]", optionsValidDomainsList);
66+
System.out.println("Is valid with validDomainsList: " + isValidValidDomainsList); // Expected: true
67+
}
6968
}
7069
```
7170

@@ -76,4 +75,4 @@ public class Main {
7675
- [CreditCardValidator](https://multiform-validator.github.io/java/classes/CreditCardValidator)
7776
- [FileValidator](https://multiform-validator.github.io/java/classes/FileValidator)
7877
- [Utils](https://multiform-validator.github.io/java/classes/Utils)
79-
- [Validator](https://multiform-validator.github.io/java/classes/Validator)
78+
- [Validator](https://multiform-validator.github.io/java/classes/Validator)

docs/content/classes/Validator.md

+1-22
Original file line numberDiff line numberDiff line change
@@ -160,27 +160,6 @@ public class Main {
160160
}
161161
```
162162

163-
### isNumber
164-
165-
```java
166-
import static io.github.multiform_validator.Validator.isNumber;
167-
168-
public class Main {
169-
public static void main(String[] args) {
170-
valid();
171-
invalid();
172-
}
173-
174-
private static void valid() {
175-
System.out.println(isNumber("123")); // true
176-
}
177-
178-
private static void invalid() {
179-
System.out.println(isNumber("123a")); // false
180-
}
181-
}
182-
```
183-
184163
### isPort
185164

186165
```java
@@ -263,4 +242,4 @@ public class Main {
263242
- [CreditCardValidator](https://multiform-validator.github.io/java/classes/CreditCardValidator)
264243
- [FileValidator](https://multiform-validator.github.io/java/classes/FileValidator)
265244
- [Utils](https://multiform-validator.github.io/java/classes/Utils)
266-
- [Validate](https://multiform-validator.github.io/java/classes/Validate)
245+
- [Validate](https://multiform-validator.github.io/java/classes/Validate)

0 commit comments

Comments
 (0)