Dragonestia/RoomPicker
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed class 'ValidateIdentifier' to 'IdentifierValidator'

Browse Source
This commit is contained in:
Andrey Terentev 2024-03-11 20:48:07 +07:00 committed by Andrey Terentev
parent 1f0c93d809
commit b8042903aa
4 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/ru/dragonestia/picker/util/NamingValidator.java
View File

@ -4,7 +4,7 @@ import org.springframework.stereotype.Component;
import ru.dragonestia.picker.api.exception.InvalidNodeIdentifierException; import ru.dragonestia.picker.api.exception.InvalidNodeIdentifierException;
import ru.dragonestia.picker.api.exception.InvalidRoomIdentifierException; import ru.dragonestia.picker.api.exception.InvalidRoomIdentifierException;
import ru.dragonestia.picker.api.exception.InvalidUsernamesException; 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 ru.dragonestia.picker.model.User;
import java.util.LinkedList; import java.util.LinkedList;
@ -14,19 +14,19 @@ import java.util.List;
public class NamingValidator { public class NamingValidator {
public void validateNodeId(String input) throws InvalidNodeIdentifierException { public void validateNodeId(String input) throws InvalidNodeIdentifierException {
if (ValidateIdentifier.forNode(input)) return; if (IdentifierValidator.forNode(input)) return;
throw new InvalidNodeIdentifierException(input); throw new InvalidNodeIdentifierException(input);
} }
public void validateRoomId(String nodeId, String input) throws InvalidRoomIdentifierException { public void validateRoomId(String nodeId, String input) throws InvalidRoomIdentifierException {
if (ValidateIdentifier.forRoom(input)) return; if (IdentifierValidator.forRoom(input)) return;
throw new InvalidRoomIdentifierException(nodeId, input); throw new InvalidRoomIdentifierException(nodeId, input);
} }
public boolean validateUserId(String input) { public boolean validateUserId(String input) {
return ValidateIdentifier.forUser(input); return IdentifierValidator.forUser(input);
} }
public List<User> validateUserIds(List<String> input) throws InvalidUsernamesException { public List<User> validateUserIds(List<String> input) throws InvalidUsernamesException {

4
client-api/src/main/java/ru/dragonestia/picker/api/util/ValidateIdentifier.java → client-api/src/main/java/ru/dragonestia/picker/api/util/IdentifierValidator.java
View File

@ -1,8 +1,8 @@
package ru.dragonestia.picker.api.util; package ru.dragonestia.picker.api.util;
public class ValidateIdentifier { public class IdentifierValidator {
private ValidateIdentifier() {} private IdentifierValidator() {}
public static boolean forNode(String nodeId) { public static boolean forNode(String nodeId) {
return nodeId.matches("^(?!-)[a-z\\d-]{0,31}[a-z\\d](?!-)$"); return nodeId.matches("^(?!-)[a-z\\d-]{0,31}[a-z\\d](?!-)$");

51
client-api/src/test/java/util/IdentifierValidatorTests.java Normal file
View File

@ -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()));
}
}

51
client-api/src/test/java/util/ValidateIdentifierTests.java
View File

@ -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()));
}
}