Change methods properties

niyatanya · Apr 15, 2024 · 273f6cb · 273f6cb
1 parent 4d4250c
commit 273f6cb
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/app/src/main/java/hexlet/code/Validator.java b/app/src/main/java/hexlet/code/Validator.java
@@ -5,13 +5,13 @@
 import hexlet.code.schemas.StringSchema;
 
 public class Validator {
-    public StringSchema string() {
+    public final StringSchema string() {
         return new StringSchema();
     }
-    public NumberSchema number() {
+    public final NumberSchema number() {
         return new NumberSchema();
     }
-    public MapSchema map() {
+    public final MapSchema map() {
         return new MapSchema();
     }
 }
diff --git a/app/src/main/java/hexlet/code/schemas/BaseSchema.java b/app/src/main/java/hexlet/code/schemas/BaseSchema.java
@@ -7,13 +7,19 @@
 
 public abstract class BaseSchema<T> {
     protected Map<String, Predicate<T>> checkers = new LinkedHashMap<>();
-    public void addCheck(String checkName, Predicate<T> fn) {
+    public final void addCheck(String checkName, Predicate<T> fn) {
         checkers.put(checkName, fn);
     }
 
+    /**
+     * <p>Добавляет проверку на пустое поле и/или на null.</p>
+     * @return Возвращает схему, в которую добавлена эта проверка.
+     */
     public BaseSchema<T> required() {
-        Predicate<T> requiredFunction = ((value) -> value != null);
-        checkers.put("required", requiredFunction);
+        addCheck(
+                "required",
+                value -> value != null
+        );
         return this;
     }
 

diff --git a/app/src/main/java/hexlet/code/schemas/MapSchema.java b/app/src/main/java/hexlet/code/schemas/MapSchema.java
@@ -6,15 +6,15 @@
 @NoArgsConstructor
 public class MapSchema extends BaseSchema<Map<?, ?>> {
 
-    public MapSchema sizeof(int size) {
+    public final MapSchema sizeof(int size) {
         addCheck(
                 "sizeof",
                 value -> value.size() == size
         );
         return this;
     }
 
-    public <T> MapSchema shape(Map<String, BaseSchema<T>> schemas) {
+    public final <T> MapSchema shape(Map<String, BaseSchema<T>> schemas) {
         addCheck(
                 "shape",
                 map -> {

diff --git a/app/src/main/java/hexlet/code/schemas/NumberSchema.java b/app/src/main/java/hexlet/code/schemas/NumberSchema.java
@@ -5,15 +5,15 @@
 @NoArgsConstructor
 public class NumberSchema extends BaseSchema<Integer> {
 
-    public NumberSchema positive() {
+    public final NumberSchema positive() {
         addCheck(
                 "positive",
                 value ->  value == null || value > 0
         );
         return this;
     }
 
-    public NumberSchema range(int startIndex, int finalIndex) {
+    public final NumberSchema range(int startIndex, int finalIndex) {
         addCheck(
                 "range",
                 value -> value >= startIndex && value <= finalIndex

diff --git a/app/src/main/java/hexlet/code/schemas/StringSchema.java b/app/src/main/java/hexlet/code/schemas/StringSchema.java
@@ -6,23 +6,23 @@
 public class StringSchema extends BaseSchema<String> {
 
     @Override
-    public StringSchema required() {
+    public final StringSchema required() {
         addCheck(
                 "required",
                 value -> value != null && !value.isEmpty()
         );
         return this;
     }
 
-    public StringSchema minLength(int minLength) {
+    public final StringSchema minLength(int minLength) {
         addCheck(
                 "minLength",
                 value -> value.length() > minLength
         );
         return this;
     }
 
-    public StringSchema contains(String content) {
+    public final StringSchema contains(String content) {
         addCheck(
                 "contains",
                 value -> value.contains(content)

diff --git a/app/src/test/java/hexlet/code/schemas/StringSchemaTest.java b/app/src/test/java/hexlet/code/schemas/StringSchemaTest.java
@@ -11,7 +11,7 @@ public class StringSchemaTest {
     private static StringSchema stringSchema;
 
     @BeforeEach
-    public void preparation() {
+    public final void preparation() {
         Validator val = new Validator();
         stringSchema = val.string();
     }