add generics

MarieTask · Jan 30, 2024 · 34b5744 · 34b5744
1 parent ea61f48
commit 34b5744
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/app/src/main/java/hexlet/code/schemas/BaseSchema.java b/app/src/main/java/hexlet/code/schemas/BaseSchema.java
@@ -4,8 +4,8 @@
 import java.util.List;
 import java.util.function.Predicate;
 
-public abstract class BaseSchema {
-    protected final List<Predicate<Object>> conditions;
+public abstract class BaseSchema<T> {
+    protected final List<Predicate<T>> conditions;
     private Boolean isRequired = false;
 
     protected BaseSchema() {
@@ -16,10 +16,10 @@ protected BaseSchema() {
     protected final void setIsRequired() {
         this.isRequired = Boolean.TRUE;
     }
-    protected final void addCondition(Predicate<Object> condition) {
+    protected final void addCondition(Predicate<T> condition) {
         conditions.add(condition);
     }
-    public final boolean isValid(Object obj) {
+    public final boolean isValid(T obj) {
         if (!isRequired && !(conditions.get(0).test(obj))) {
             System.out.println(conditions.get(0));
             return true;

diff --git a/app/src/main/java/hexlet/code/schemas/MapSchema.java b/app/src/main/java/hexlet/code/schemas/MapSchema.java
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-public class MapSchema extends BaseSchema {
+public class MapSchema<String, T> extends BaseSchema<T> {
 
     public MapSchema() {
         super.conditions.add(s -> s instanceof Map);
@@ -20,8 +20,8 @@ public MapSchema sizeof(int countPairs) {
         super.addCondition(s -> ((Map<?, ?>) s).size() == countPairs);
         return this;
     }
-    public MapSchema shape(Map<String, BaseSchema> map) {
-        map.keySet().forEach(key -> super.addCondition(s -> map.get(key).isValid(((Map<?, ?>) s).get(key))));
+    public MapSchema shape(Map<String, BaseSchema<T>> map) {
+        map.keySet().forEach(key -> super.addCondition(s -> map.get(key).isValid((T) ((Map<?, ?>) s).get(key))));
         return this;
     }
 }
diff --git a/app/src/main/java/hexlet/code/schemas/NumberSchema.java b/app/src/main/java/hexlet/code/schemas/NumberSchema.java
@@ -2,7 +2,7 @@
 
 import java.util.function.Predicate;
 
-public class NumberSchema extends BaseSchema {
+public class NumberSchema<T> extends BaseSchema<T> {
 
     public NumberSchema() {
         super.conditions.add(s -> s instanceof Integer);
@@ -14,13 +14,13 @@ public NumberSchema required() {
     }
 
     public NumberSchema positive() {
-        Predicate<Object> posConditions = s -> (int) s > 0;
+        Predicate<T> posConditions = s -> (int) s > 0;
         addCondition(posConditions);
         return this;
     }
 
     public NumberSchema range(int min, int max) {
-        Predicate<Object> numRange = s -> (int) s >= min && (int) s <= max;
+        Predicate<T> numRange = s -> (int) s >= min && (int) s <= max;
         addCondition(numRange);
         return this;
     }

diff --git a/app/src/main/java/hexlet/code/schemas/StringSchema.java b/app/src/main/java/hexlet/code/schemas/StringSchema.java
@@ -3,7 +3,7 @@
 import java.util.Objects;
 import java.util.function.Predicate;
 
-public class StringSchema extends BaseSchema {
+public class StringSchema<T> extends BaseSchema<T> {
 
     public StringSchema() {
         super.conditions.add(s -> !(Objects.equals(s, "")) && s instanceof String);
@@ -18,13 +18,13 @@ public StringSchema minLength(int userNumber) {
         if (userNumber < 0) {
             throw new IndexOutOfBoundsException("Index less than zero!");
         }
-        Predicate<Object> stringLength = s -> ((String) s).length() >= userNumber;
+        Predicate<T> stringLength = s -> ((String) s).length() >= userNumber;
         super.addCondition(stringLength);
         return this;
     }
 
     public StringSchema contains(String userData) {
-        Predicate<Object> containsString = s -> ((String) s).contains(userData);
+        Predicate<T> containsString = s -> ((String) s).contains(userData);
         super.addCondition(containsString);
         return this;
     }