addd

Author: Bascy6

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

@@ -1,17 +1,12 @@
 package hexlet.code.schemas;
 
-public abstract class BaseSchema<T extends BaseSchema<T>> {
+public abstract class BaseSchema<T> {
     protected boolean isRequired = false;
 
-    @SuppressWarnings("unchecked")
     public T required() {
         this.isRequired = true;
         return (T) this;
     }
 
-    protected boolean checkRequired(Object value) {
-        return !isRequired || value != null;
-    }
-
     public abstract boolean isValid(Object value);
 }

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

@@ -8,7 +8,7 @@ public class MapSchema extends BaseSchema<MapSchema> {
 
     @Override
     public boolean isValid(Object value) {
-        if (!checkRequired(value)) {
+        if (isRequired && value == null) {
             return false;
         }
         if (value == null) {
@@ -24,7 +24,7 @@ public boolean isValid(Object value) {
         if (schemas != null) {
             for (Map.Entry<String, BaseSchema<?>> entry : schemas.entrySet()) {
                 String key = entry.getKey();
-                BaseSchema<?> schema = entry.getValue();
+                BaseSchema<String> schema = (BaseSchema<String>) entry.getValue();
                 if (!map.containsKey(key) || !schema.isValid(map.get(key))) {
                     return false;
                 }

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

@@ -18,7 +18,7 @@ public NumberSchema range(int min, int max) {
 
     @Override
     public boolean isValid(Object value) {
-        if (!checkRequired(value)) {
+        if (isRequired && value == null) {
             return false;
         }
         if (value == null) {

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

@@ -16,7 +16,7 @@ public StringSchema contains(String substring) {
 
     @Override
     public boolean isValid(Object value) {
-        if (!checkRequired(value)) {
+        if (isRequired && value == null) {
             return false;
         }
         if (value == null) {