add

Author: Bascy6

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

@@ -1,8 +1,9 @@
 package hexlet.code.schemas;
 
+import java.util.HashMap;
 import java.util.Map;
 
-public class MapSchema extends BaseSchema<Map<String, ?>> {
+public class MapSchema extends BaseSchema<MapSchema> {
     private Integer size;
     private Map<String, BaseSchema<?>> shapeSchemas;
 
@@ -11,44 +12,36 @@ public MapSchema sizeof(int newSize) {
         return this;
     }
 
-    public MapSchema shape(Map<String, BaseSchema<?>> schemas) {
-        this.shapeSchemas = schemas;
+    public MapSchema shape(Map<String, ? extends BaseSchema<?>> schemas) {
+        this.shapeSchemas = new HashMap<>(schemas);
         return this;
     }
 
     @Override
     public boolean isValid(Object value) {
-
         if (value == null) {
             return !required;
         }
-
         if (!(value instanceof Map)) {
             return false;
         }
-
         Map<?, ?> mapValue = (Map<?, ?>) value;
-
         if (size != null && mapValue.size() != size) {
             return false;
         }
-
         if (shapeSchemas != null) {
             for (Map.Entry<String, BaseSchema<?>> entry : shapeSchemas.entrySet()) {
                 String key = entry.getKey();
                 BaseSchema<?> schema = entry.getValue();
-
                 if (!mapValue.containsKey(key)) {
                     return false;
                 }
-
                 Object keyValue = mapValue.get(key);
                 if (!schema.isValid(keyValue)) {
                     return false;
                 }
             }
         }
-
         return true;
     }
 }

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

@@ -18,29 +18,22 @@ public NumberSchema range(int min, int max) {
 
     @Override
     public boolean isValid(Object value) {
-
         if (value == null) {
             return !required;
         }
-
         if (!(value instanceof Integer)) {
             return false;
         }
-
         int numValue = (Integer) value;
-
         if (positive && numValue <= 0) {
             return false;
         }
-
         if (minRange != null && numValue < minRange) {
             return false;
         }
-
         if (maxRange != null && numValue > maxRange) {
             return false;
         }
-
         return true;
     }
 }

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

@@ -16,29 +16,22 @@ public StringSchema contains(String substring) {
 
     @Override
     public boolean isValid(Object value) {
-
         if (value == null) {
-            return false;
+            return !required;
         }
-
         if (!(value instanceof String)) {
             return false;
         }
-
         String strValue = (String) value;
-
         if (required && strValue.isEmpty()) {
             return false;
         }
-
         if (minLength != null && strValue.length() < minLength) {
             return false;
         }
-
         if (contains != null && !strValue.contains(contains)) {
             return false;
         }
-
         return true;
     }
 }

app/src/test/java/hexlet/code/StringSchemaTest.java

@@ -12,7 +12,7 @@ public void testRequired() {
         Validator validator = new Validator();
         StringSchema schema = validator.string();
 
-        assertFalse(schema.isValid(null));
+        assertTrue(schema.isValid(null));
         assertTrue(schema.isValid(""));
         assertTrue(schema.isValid("Hello"));
 
@@ -27,7 +27,7 @@ public void testMinLength() {
         Validator validator = new Validator();
         StringSchema schema = validator.string().minLength(3);
 
-        assertFalse(schema.isValid(null));
+        assertTrue(schema.isValid(null));
         assertFalse(schema.isValid(""));
         assertFalse(schema.isValid("ab"));
         assertTrue(schema.isValid("abc"));
@@ -43,7 +43,7 @@ public void testContains() {
         Validator validator = new Validator();
         StringSchema schema = validator.string().contains("test");
 
-        assertFalse(schema.isValid(null));
+        assertTrue(schema.isValid(null));
         assertFalse(schema.isValid(""));
         assertFalse(schema.isValid("tes"));
         assertTrue(schema.isValid("test"));