Check 2 ?

Maxonquall · Apr 1, 2024 · ec0060c · ec0060c
1 parent 071a884
commit ec0060c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/app/src/main/java/hexlet/code/schemas/MapSchema.java b/app/src/main/java/hexlet/code/schemas/MapSchema.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 
 
-public final class MapSchema extends BaseSchema {
+public final class MapSchema extends BaseSchema<Map<?, ?>> {
 
 
     public MapSchema() {
@@ -22,11 +22,17 @@ public MapSchema sizeof(int size) {
     }
 
     public <T> MapSchema shape(Map<String, BaseSchema<T>> schemas) {
-        addCheck("shape", value -> schemas.entrySet()
-                .stream()
-                ;
-
+        addCheck(
+                "shape",
+                map -> {
+                    return schemas.entrySet().stream().allMatch(e -> {
+                        var v =  map.get(e.getKey());
+                        var schema = e.getValue();
+                        return schema.isValid((T) v);
+                    });
+                }
+        );
 
         return this;
     }
-}
+}
diff --git a/app/src/test/java/hexlet/code/ApplicationTest.java b/app/src/test/java/hexlet/code/ApplicationTest.java
@@ -220,7 +220,8 @@ void nestedMapNumberTest() {
     void nestedMapMapTest() {
         var v = new Validator();
         var schema = v.map();
-        var schemas = new HashMap<String, BaseSchema<Map>>();
+       // var schemas = new HashMap<String, BaseSchema<Map>>();
+        var schemas = new HashMap<String, BaseSchema<Map<?, ?>>>();
         schemas.put("Map1", v.map().required().sizeof(2));
         schemas.put("Map2", v.map().sizeof(2));
         schema.shape(schemas);