add

Author: Bascy6

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic"
+}

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

@@ -0,0 +1,13 @@
+package hexlet.code;
+
+public abstract class BaseSchema<T> {
+    protected boolean required;
+
+    @SuppressWarnings("unchecked")
+    public T required() {
+        this.required = true;
+        return (T) this;
+    }
+
+    public abstract boolean isValid(Object value);
+}

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

@@ -0,0 +1,54 @@
+package hexlet.code;
+
+import java.util.Map;
+
+public class MapSchema<K> extends BaseSchema<Map<K, ?>> {
+    private Integer size;
+    private Map<K, BaseSchema<?>> shapeSchemas;
+
+    public MapSchema<K> sizeof(int newSize) {
+        this.size = newSize;
+        return this;
+    }
+
+    public MapSchema<K> shape(Map<K, ? extends BaseSchema<?>> schemas) {
+        this.shapeSchemas = (Map<K, BaseSchema<?>>) 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<K, BaseSchema<?>> entry : shapeSchemas.entrySet()) {
+                K 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/NumberSchema.java

@@ -0,0 +1,46 @@
+package hexlet.code;
+
+public class NumberSchema extends BaseSchema<NumberSchema> {
+    private boolean positive;
+    private Integer minRange;
+    private Integer maxRange;
+
+    public NumberSchema positive() {
+        this.positive = true;
+        return this;
+    }
+
+    public NumberSchema range(int min, int max) {
+        this.minRange = min;
+        this.maxRange = max;
+        return this;
+    }
+
+    @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 renamed to app/src/main/java/hexlet/code/StringSchema.java

@@ -1,25 +1,8 @@
-package hexlet.code.schemas;
+package hexlet.code;
 
 public class StringSchema extends BaseSchema<StringSchema> {
-    private boolean isRequired = false;
-    private int minLength = 0;
-    private String contains = null;
-
-    @Override
-    protected StringSchema getThis() {
-        return this;
-    }
-
-    @Override
-    public StringSchema required() {
-        this.isRequired = true;
-        return super.required();
-    }
-
-    @Override
-    public boolean isRequired() {
-        return isRequired;
-    }
+    private Integer minLength;
+    private String contains;
 
     public StringSchema minLength(int length) {
         this.minLength = length;
@@ -33,22 +16,29 @@ public StringSchema contains(String substring) {
 
     @Override
     public boolean isValid(Object value) {
+
         if (value == null) {
-            return !isRequired;
+            return false;
         }
+
         if (!(value instanceof String)) {
             return false;
         }
+
         String strValue = (String) value;
-        if (isRequired && strValue.isEmpty()) {
+
+        if (required && strValue.isEmpty()) {
             return false;
         }
-        if (strValue.length() < minLength) {
+
+        if (minLength != null && strValue.length() < minLength) {
             return false;
         }
+
         if (contains != null && !strValue.contains(contains)) {
             return false;
         }
+
         return true;
     }
 }

app/src/main/java/hexlet/code/Validator.java

@@ -1,9 +1,5 @@
 package hexlet.code;
 
-import hexlet.code.schemas.MapSchema;
-import hexlet.code.schemas.NumberSchema;
-import hexlet.code.schemas.StringSchema;
-
 public class Validator {
     public StringSchema string() {
         return new StringSchema();