Skip to content

Commit 589cb51

Browse files
committed
add
1 parent 461c64b commit 589cb51

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

app/src/main/java/hexlet/code/schemas/BaseSchema.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package hexlet.code.schemas;
22

3-
public abstract class BaseSchema<T extends BaseSchema<T>> {
3+
public abstract class BaseSchema<T> {
44
protected boolean isRequired = false;
55

6-
@SuppressWarnings("unchecked")
7-
public T required() {
6+
public BaseSchema<T> required() {
87
this.isRequired = true;
9-
return (T) this;
8+
return this;
109
}
1110

1211
public abstract boolean isValid(Object value);

app/src/main/java/hexlet/code/schemas/MapSchema.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
import java.util.Map;
44

5-
public class MapSchema extends BaseSchema<MapSchema> {
5+
public class MapSchema extends BaseSchema<Map<String, ?>> {
66
private int requiredSize = -1;
77
private Map<String, BaseSchema<?>> schemas;
88

99
@Override
1010
public MapSchema required() {
11-
return super.required();
11+
super.required();
12+
return this;
1213
}
1314

1415
public MapSchema sizeof(int size) {

app/src/main/java/hexlet/code/schemas/NumberSchema.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package hexlet.code.schemas;
22

3-
public class NumberSchema extends BaseSchema<NumberSchema> {
3+
public class NumberSchema extends BaseSchema<Number> {
44
private boolean isPositive = false;
55
private int minRange = Integer.MIN_VALUE;
66
private int maxRange = Integer.MAX_VALUE;
77

88
@Override
99
public NumberSchema required() {
10-
return super.required();
10+
super.required();
11+
return this;
1112
}
1213

1314
public NumberSchema positive() {

app/src/main/java/hexlet/code/schemas/StringSchema.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package hexlet.code.schemas;
22

3-
public class StringSchema extends BaseSchema<StringSchema> {
3+
public class StringSchema extends BaseSchema<String> {
44
private int minLength = 0;
55
private String containsSubstring = null;
66

77
@Override
88
public StringSchema required() {
9-
return super.required();
9+
super.required();
10+
return this;
1011
}
1112

1213
public StringSchema minLength(int length) {

0 commit comments

Comments
 (0)