add

Author: Bascy6

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

@@ -1,8 +1,9 @@
 package hexlet.code.schemas;
 
-public abstract class BaseSchema<T> {
+public abstract class BaseSchema<T extends BaseSchema<T>> {
     protected boolean isRequired = false;
 
+    @SuppressWarnings("unchecked")
     public T required() {
         this.isRequired = true;
         return (T) this;

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

@@ -6,6 +6,21 @@ public class MapSchema extends BaseSchema<MapSchema> {
     private int requiredSize = -1;
     private Map<String, BaseSchema<?>> schemas;
 
+    @Override
+    public MapSchema required() {
+        return super.required();
+    }
+
+    public MapSchema sizeof(int size) {
+        this.requiredSize = size;
+        return this;
+    }
+
+    public MapSchema shape(Map<String, BaseSchema<?>> shapeSchemas) {
+        this.schemas = shapeSchemas;
+        return this;
+    }
+
     @Override
     public boolean isValid(Object value) {
         if (isRequired && value == null) {
@@ -24,22 +39,12 @@ public boolean isValid(Object value) {
         if (schemas != null) {
             for (Map.Entry<String, BaseSchema<?>> entry : schemas.entrySet()) {
                 String key = entry.getKey();
-                BaseSchema<String> schema = (BaseSchema<String>) entry.getValue();
+                BaseSchema<?> schema = entry.getValue();
                 if (!map.containsKey(key) || !schema.isValid(map.get(key))) {
                     return false;
                 }
             }
         }
         return true;
     }
-
-    public MapSchema sizeof(int size) {
-        this.requiredSize = size;
-        return this;
-    }
-
-    public MapSchema shape(Map<String, BaseSchema<?>> shapeSchemas) {
-        this.schemas = shapeSchemas;
-        return this;
-    }
 }

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

@@ -5,6 +5,11 @@ public class NumberSchema extends BaseSchema<NumberSchema> {
     private int minRange = Integer.MIN_VALUE;
     private int maxRange = Integer.MAX_VALUE;
 
+    @Override
+    public NumberSchema required() {
+        return super.required();
+    }
+
     public NumberSchema positive() {
         this.isPositive = true;
         return this;

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

@@ -4,6 +4,11 @@ public class StringSchema extends BaseSchema<StringSchema> {
     private int minLength = 0;
     private String containsSubstring = null;
 
+    @Override
+    public StringSchema required() {
+        return super.required();
+    }
+
     public StringSchema minLength(int length) {
         this.minLength = length;
         return this;