More error handling

Author: NavidMitchell

structures-core/src/main/java/org/kinotic/structures/internal/api/services/impl/DefaultApplicationService.java

@@ -30,7 +30,7 @@ public DefaultApplicationService(ElasticsearchAsyncClient esAsyncClient,
 
     @Override
     public CompletableFuture<Application> createApplicationIfNotExist(String id, String description) {
-        Validate.notEmpty(id, "id cannot be empty");
+        StructuresUtil.validateApplicationId(id);
         return findById(id)
                 .thenCompose(application -> {
                     if(application != null){

structures-core/src/main/java/org/kinotic/structures/internal/utils/StructuresUtil.java

@@ -11,7 +11,7 @@
 
 public class StructuresUtil {
 
-    private static final Pattern IdentifierNamePattern = Pattern.compile("^[A-Za-z_][A-Za-z0-9_]*$");
+    private static final Pattern StructureNamePattern = Pattern.compile("^[A-Za-z_][A-Za-z0-9_]*$");
     private static final Pattern StructureApplicationPattern = Pattern.compile("^[A-Za-z][A-Za-z0-9._-]*$");
     private static final Pattern StructureProjectIdPattern = Pattern.compile("^[a-z][a-z0-9._-]*$");
 
@@ -51,8 +51,10 @@ public static void validateStructure(Structure structure){
      * @throws IllegalArgumentException will be thrown if the structure name is invalid
      */
     public static void validateStructureName(String structureName){
-        if (structureName == null
-                || !IdentifierNamePattern.matcher(structureName).matches()){
+        if(structureName == null){
+            throw new IllegalArgumentException("Structure name must not be null");
+        }
+        if (!StructureNamePattern.matcher(structureName).matches()){
             throw new IllegalArgumentException("Structure Name Invalid, first character must be a " +
                                                "letter, number or underscore. And contain only letters, numbers or underscores. Got "+ structureName);
         }
@@ -64,17 +66,21 @@ public static void validateStructureName(String structureName){
      * @param applicationId to validate
      * @throws IllegalArgumentException will be thrown if the structure application is invalid
      */
-    public static void validateApplicationId(String applicationId){
-        if (applicationId == null
-                || !StructureApplicationPattern.matcher(applicationId).matches()){
+    public static void validateApplicationId(String applicationId) {
+        if (applicationId == null) {
+            throw new IllegalArgumentException("Application Id must not be null");
+        }
+        if (!StructureApplicationPattern.matcher(applicationId).matches()){
             throw new IllegalArgumentException("Structure Application Id Invalid, first character must be a " +
                                                "letter. And contain only letters, numbers, periods, underscores or dashes. Got "+ applicationId);
         }
     }
 
     public static void validateProjectId(String projectId){
-        if (projectId == null
-                || !StructureProjectIdPattern.matcher(projectId).matches()){
+        if(projectId == null){
+            throw new IllegalArgumentException("Project Id must not be null");
+        }
+        if (!StructureProjectIdPattern.matcher(projectId).matches()){
             throw new IllegalArgumentException("Structure Project Id Invalid, first character must be a " +
                                                "letter. And contain only letters, numbers, periods, underscores or dashes. Got "+ projectId);
         }
@@ -87,9 +93,13 @@ public static void validateProjectId(String projectId){
      * @throws IllegalArgumentException will be thrown if the property name is invalid
      */
     public static void validatePropertyName(String propertyName){
-        if(propertyName == null
-            || propertyName.length() > 255
-            || !IdentifierNamePattern.matcher(propertyName).matches()){
+        if(propertyName == null){
+            throw new IllegalArgumentException("Property Name must not be null");
+        }
+        if(propertyName.length() > 255){
+            throw new IllegalArgumentException("Property Name cannot have more than 255 characters");
+        }
+        if(!StructureNamePattern.matcher(propertyName).matches()){
             throw new IllegalArgumentException("Property Name Invalid, first character must be a " +
                                                "letter, number or underscore. And contain only letters, numbers or underscores. Got "+ propertyName);
         }