From b8042903aa1fee888d40e866ce46330397b26af4 Mon Sep 17 00:00:00 2001 From: ScarletRedMan Date: Mon, 11 Mar 2024 20:48:07 +0700 Subject: [PATCH] Renamed class 'ValidateIdentifier' to 'IdentifierValidator' --- .../picker/util/NamingValidator.java | 8 +-- ...entifier.java => IdentifierValidator.java} | 4 +- .../java/util/IdentifierValidatorTests.java | 51 +++++++++++++++++++ .../java/util/ValidateIdentifierTests.java | 51 ------------------- 4 files changed, 57 insertions(+), 57 deletions(-) rename client-api/src/main/java/ru/dragonestia/picker/api/util/{ValidateIdentifier.java => IdentifierValidator.java} (85%) create mode 100644 client-api/src/test/java/util/IdentifierValidatorTests.java delete mode 100644 client-api/src/test/java/util/ValidateIdentifierTests.java diff --git a/app/src/main/java/ru/dragonestia/picker/util/NamingValidator.java b/app/src/main/java/ru/dragonestia/picker/util/NamingValidator.java index afa380b..9ed1238 100644 --- a/app/src/main/java/ru/dragonestia/picker/util/NamingValidator.java +++ b/app/src/main/java/ru/dragonestia/picker/util/NamingValidator.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Component; import ru.dragonestia.picker.api.exception.InvalidNodeIdentifierException; import ru.dragonestia.picker.api.exception.InvalidRoomIdentifierException; import ru.dragonestia.picker.api.exception.InvalidUsernamesException; -import ru.dragonestia.picker.api.util.ValidateIdentifier; +import ru.dragonestia.picker.api.util.IdentifierValidator; import ru.dragonestia.picker.model.User; import java.util.LinkedList; @@ -14,19 +14,19 @@ import java.util.List; public class NamingValidator { public void validateNodeId(String input) throws InvalidNodeIdentifierException { - if (ValidateIdentifier.forNode(input)) return; + if (IdentifierValidator.forNode(input)) return; throw new InvalidNodeIdentifierException(input); } public void validateRoomId(String nodeId, String input) throws InvalidRoomIdentifierException { - if (ValidateIdentifier.forRoom(input)) return; + if (IdentifierValidator.forRoom(input)) return; throw new InvalidRoomIdentifierException(nodeId, input); } public boolean validateUserId(String input) { - return ValidateIdentifier.forUser(input); + return IdentifierValidator.forUser(input); } public List validateUserIds(List input) throws InvalidUsernamesException { diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/util/ValidateIdentifier.java b/client-api/src/main/java/ru/dragonestia/picker/api/util/IdentifierValidator.java similarity index 85% rename from client-api/src/main/java/ru/dragonestia/picker/api/util/ValidateIdentifier.java rename to client-api/src/main/java/ru/dragonestia/picker/api/util/IdentifierValidator.java index b9df6b4..596ea6a 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/util/ValidateIdentifier.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/util/IdentifierValidator.java @@ -1,8 +1,8 @@ package ru.dragonestia.picker.api.util; -public class ValidateIdentifier { +public class IdentifierValidator { - private ValidateIdentifier() {} + private IdentifierValidator() {} public static boolean forNode(String nodeId) { return nodeId.matches("^(?!-)[a-z\\d-]{0,31}[a-z\\d](?!-)$"); diff --git a/client-api/src/test/java/util/IdentifierValidatorTests.java b/client-api/src/test/java/util/IdentifierValidatorTests.java new file mode 100644 index 0000000..76e8209 --- /dev/null +++ b/client-api/src/test/java/util/IdentifierValidatorTests.java @@ -0,0 +1,51 @@ +package util; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import ru.dragonestia.picker.api.util.IdentifierValidator; + +import java.util.UUID; + +public class IdentifierValidatorTests { + + @Test + void test_forNodes() { + Assertions.assertFalse(IdentifierValidator.forNode("")); + Assertions.assertTrue(IdentifierValidator.forNode("a")); + Assertions.assertTrue(IdentifierValidator.forNode("aboba123")); + Assertions.assertFalse(IdentifierValidator.forNode("Aboba123")); + Assertions.assertTrue(IdentifierValidator.forNode("node-identifier")); + Assertions.assertFalse(IdentifierValidator.forNode("node identifier")); + Assertions.assertFalse(IdentifierValidator.forNode("-")); + Assertions.assertFalse(IdentifierValidator.forNode("-a")); + Assertions.assertFalse(IdentifierValidator.forNode("a-")); + Assertions.assertTrue(IdentifierValidator.forNode("a".repeat(32))); + Assertions.assertFalse(IdentifierValidator.forNode("a".repeat(33))); + } + + @Test + void test_forRooms() { + Assertions.assertFalse(IdentifierValidator.forRoom("")); + Assertions.assertTrue(IdentifierValidator.forRoom("a")); + Assertions.assertTrue(IdentifierValidator.forRoom("aboba123")); + Assertions.assertFalse(IdentifierValidator.forRoom("Aboba123")); + Assertions.assertTrue(IdentifierValidator.forRoom("node-identifier")); + Assertions.assertFalse(IdentifierValidator.forRoom("node identifier")); + Assertions.assertFalse(IdentifierValidator.forRoom("-")); + Assertions.assertFalse(IdentifierValidator.forRoom("-a")); + Assertions.assertFalse(IdentifierValidator.forRoom("a-")); + Assertions.assertTrue(IdentifierValidator.forRoom("a".repeat(32))); + Assertions.assertFalse(IdentifierValidator.forRoom("a".repeat(33))); + } + + @Test + void test_forUsers() { + Assertions.assertFalse(IdentifierValidator.forUser("")); + Assertions.assertTrue(IdentifierValidator.forUser("a")); + Assertions.assertTrue(IdentifierValidator.forUser("a".repeat(64))); + Assertions.assertFalse(IdentifierValidator.forUser("a".repeat(65))); + Assertions.assertTrue(IdentifierValidator.forUser("aboba")); + Assertions.assertTrue(IdentifierValidator.forUser("AboBa-AAA @aaa:aaa_aa;aa.aaa99")); + Assertions.assertTrue(IdentifierValidator.forUser(UUID.randomUUID().toString())); + } +} diff --git a/client-api/src/test/java/util/ValidateIdentifierTests.java b/client-api/src/test/java/util/ValidateIdentifierTests.java deleted file mode 100644 index 24fffa4..0000000 --- a/client-api/src/test/java/util/ValidateIdentifierTests.java +++ /dev/null @@ -1,51 +0,0 @@ -package util; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import ru.dragonestia.picker.api.util.ValidateIdentifier; - -import java.util.UUID; - -public class ValidateIdentifierTests { - - @Test - void test_forNodes() { - Assertions.assertFalse(ValidateIdentifier.forNode("")); - Assertions.assertTrue(ValidateIdentifier.forNode("a")); - Assertions.assertTrue(ValidateIdentifier.forNode("aboba123")); - Assertions.assertFalse(ValidateIdentifier.forNode("Aboba123")); - Assertions.assertTrue(ValidateIdentifier.forNode("node-identifier")); - Assertions.assertFalse(ValidateIdentifier.forNode("node identifier")); - Assertions.assertFalse(ValidateIdentifier.forNode("-")); - Assertions.assertFalse(ValidateIdentifier.forNode("-a")); - Assertions.assertFalse(ValidateIdentifier.forNode("a-")); - Assertions.assertTrue(ValidateIdentifier.forNode("a".repeat(32))); - Assertions.assertFalse(ValidateIdentifier.forNode("a".repeat(33))); - } - - @Test - void test_forRooms() { - Assertions.assertFalse(ValidateIdentifier.forRoom("")); - Assertions.assertTrue(ValidateIdentifier.forRoom("a")); - Assertions.assertTrue(ValidateIdentifier.forRoom("aboba123")); - Assertions.assertFalse(ValidateIdentifier.forRoom("Aboba123")); - Assertions.assertTrue(ValidateIdentifier.forRoom("node-identifier")); - Assertions.assertFalse(ValidateIdentifier.forRoom("node identifier")); - Assertions.assertFalse(ValidateIdentifier.forRoom("-")); - Assertions.assertFalse(ValidateIdentifier.forRoom("-a")); - Assertions.assertFalse(ValidateIdentifier.forRoom("a-")); - Assertions.assertTrue(ValidateIdentifier.forRoom("a".repeat(32))); - Assertions.assertFalse(ValidateIdentifier.forRoom("a".repeat(33))); - } - - @Test - void test_forUsers() { - Assertions.assertFalse(ValidateIdentifier.forUser("")); - Assertions.assertTrue(ValidateIdentifier.forUser("a")); - Assertions.assertTrue(ValidateIdentifier.forUser("a".repeat(64))); - Assertions.assertFalse(ValidateIdentifier.forUser("a".repeat(65))); - Assertions.assertTrue(ValidateIdentifier.forUser("aboba")); - Assertions.assertTrue(ValidateIdentifier.forUser("AboBa-AAA @aaa:aaa_aa;aa.aaa99")); - Assertions.assertTrue(ValidateIdentifier.forUser(UUID.randomUUID().toString())); - } -}