add

Author: Bascy6

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

@@ -2,17 +2,17 @@
 
 import java.util.Map;
 
-public class MapSchema<K> extends BaseSchema<Map<K, ?>> {
+public class MapSchema extends BaseSchema<Map<String, String>> {
     private Integer size;
-    private Map<K, BaseSchema<?>> shapeSchemas;
+    private Map<String, BaseSchema<?>> shapeSchemas;
 
-    public MapSchema<K> sizeof(int newSize) {
+    public MapSchema sizeof(int newSize) {
         this.size = newSize;
         return this;
     }
 
-    public MapSchema<K> shape(Map<K, ? extends BaseSchema<?>> schemas) {
-        this.shapeSchemas = (Map<K, BaseSchema<?>>) schemas;
+    public MapSchema shape(Map<String, BaseSchema<?>> schemas) {
+        this.shapeSchemas = schemas;
         return this;
     }
 
@@ -34,8 +34,8 @@ public boolean isValid(Object value) {
         }
 
         if (shapeSchemas != null) {
-            for (Map.Entry<K, BaseSchema<?>> entry : shapeSchemas.entrySet()) {
-                K key = entry.getKey();
+            for (Map.Entry<String, BaseSchema<?>> entry : shapeSchemas.entrySet()) {
+                String key = entry.getKey();
                 BaseSchema<?> schema = entry.getValue();
 
                 if (!mapValue.containsKey(key)) {

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

@@ -12,9 +12,9 @@
 public class MapSchemaTest {
 
     @Test
-    public void testShapeValidationWithStringKeys() {
+    public void testShapeValidation() {
         Validator validator = new Validator();
-        MapSchema<String> schema = validator.map();
+        MapSchema schema = validator.map();
 
         Map<String, BaseSchema<?>> schemas = new HashMap<>();
         schemas.put("firstName", validator.string().required());
@@ -34,27 +34,33 @@ public void testShapeValidationWithStringKeys() {
         human2.put("lastName", null);
         human2.put("age", 30);
         assertFalse(schema.isValid(human2));
+
+        Map<String, Object> human3 = new HashMap<>();
+        human3.put("firstName", "Anna");
+        human3.put("lastName", "B");
+        human3.put("age", -5);
+        assertFalse(schema.isValid(human3));
+
+        Map<String, Object> human4 = new HashMap<>();
+        human4.put("firstName", "");
+        human4.put("lastName", "Brown");
+        human4.put("age", 25);
+        assertFalse(schema.isValid(human4));
     }
 
     @Test
-    public void testShapeValidationWithIntegerKeys() {
+    public void testMissingKeys() {
         Validator validator = new Validator();
-        MapSchema<Integer> schema = validator.map();
+        MapSchema schema = validator.map();
 
-        Map<Integer, BaseSchema<?>> schemas = new HashMap<>();
-        schemas.put(1, validator.string().required());
-        schemas.put(2, validator.number().positive());
+        Map<String, BaseSchema<?>> schemas = new HashMap<>();
+        schemas.put("firstName", validator.string().required());
+        schemas.put("lastName", validator.string().required());
 
         schema.shape(schemas);
 
-        Map<Integer, Object> data1 = new HashMap<>();
-        data1.put(1, "Hello");
-        data1.put(2, 42);
-        assertTrue(schema.isValid(data1));
-
-        Map<Integer, Object> data2 = new HashMap<>();
-        data2.put(1, "");
-        data2.put(2, -5);
-        assertFalse(schema.isValid(data2));
+        Map<String, Object> human = new HashMap<>();
+        human.put("firstName", "John");
+        assertFalse(schema.isValid(human));
     }
 }