Refactor and optimize source code

Author: zhossain-info

src/main/java/com/relogiclabs/jschema/exception/AnnotationAttributeException.java

@@ -0,0 +1,7 @@
+package com.relogiclabs.jschema.exception;
+
+public class AnnotationAttributeException extends BaseRuntimeException {
+    public AnnotationAttributeException(String code, String message) {
+        super(code, message);
+    }
+}

src/main/java/com/relogiclabs/jschema/exception/ArgumentTypeException.java

@@ -1,28 +1,13 @@
 package com.relogiclabs.jschema.exception;
 
 import com.relogiclabs.jschema.message.ErrorDetail;
-import com.relogiclabs.jschema.type.EValue;
 
 public class ArgumentTypeException extends InvalidArgumentException {
-    public ArgumentTypeException(String message) {
-        super(message);
-    }
-
-    public ArgumentTypeException(String code, String message, Throwable cause) {
-        super(code, message, cause);
+    public ArgumentTypeException(String code, String message) {
+        super(code, message);
     }
 
     public ArgumentTypeException(ErrorDetail detail, Throwable cause) {
         super(detail, cause);
     }
-
-    @Override
-    public FunctionArgumentTypeException failWithFunctionException() {
-        return new FunctionArgumentTypeException(this);
-    }
-
-    @Override
-    public MethodArgumentTypeException failWithMethodException(EValue self) {
-        return new MethodArgumentTypeException(self, this);
-    }
 }

src/main/java/com/relogiclabs/jschema/exception/ArgumentValueException.java

@@ -1,28 +1,9 @@
 package com.relogiclabs.jschema.exception;
 
 import com.relogiclabs.jschema.message.ErrorDetail;
-import com.relogiclabs.jschema.type.EValue;
 
 public class ArgumentValueException extends InvalidArgumentException {
-    public ArgumentValueException(String message) {
-        super(message);
-    }
-
-    public ArgumentValueException(String code, String message, Throwable cause) {
-        super(code, message, cause);
-    }
-
     public ArgumentValueException(ErrorDetail detail, Throwable cause) {
         super(detail, cause);
     }
-
-    @Override
-    public InvalidArgumentException failWithFunctionException() {
-        return new FunctionArgumentValueException(this);
-    }
-
-    @Override
-    public InvalidArgumentException failWithMethodException(EValue self) {
-        return new MethodArgumentValueException(self, this);
-    }
 }

src/main/java/com/relogiclabs/jschema/exception/BaseRuntimeException.java

@@ -8,14 +8,10 @@
 
 @Getter @Setter
 public class BaseRuntimeException extends RuntimeException {
-    // Exception creation method
+    // Exception creation method prefix
     private static final String FAIL_METHOD_PREFIX = "fail";
     private String code;
 
-    public BaseRuntimeException(String message) {
-        this(null, message, null);
-    }
-
     public BaseRuntimeException(String code, String message) {
         this(code, message, null);
     }

src/main/java/com/relogiclabs/jschema/exception/ClassInstantiationException.java

@@ -1,9 +1,23 @@
 package com.relogiclabs.jschema.exception;
 
 import com.relogiclabs.jschema.message.ErrorDetail;
+import org.antlr.v4.runtime.Token;
+
+import static com.relogiclabs.jschema.message.MessageFormatter.formatForSchema;
+
+public class ClassInstantiationException extends MultilevelRuntimeException {
+    public ClassInstantiationException(String code, String message, Throwable cause) {
+        super(code, message, cause);
+    }
 
-public class ClassInstantiationException extends BaseRuntimeException {
     public ClassInstantiationException(ErrorDetail detail, Throwable cause) {
         super(detail, cause);
     }
+
+    @Override
+    public RuntimeException translate(Token token) {
+        if(isHighLevel()) return this;
+        return new ClassInstantiationException(formatForSchema(getCode(),
+            getMessage(), token), this);
+    }
 }

src/main/java/com/relogiclabs/jschema/exception/DataOwnerMismatchedException.java

@@ -0,0 +1,7 @@
+package com.relogiclabs.jschema.exception;
+
+public class DataOwnerMismatchedException extends BaseRuntimeException {
+    public DataOwnerMismatchedException(String code, String message) {
+        super(code, message);
+    }
+}

src/main/java/com/relogiclabs/jschema/exception/DuplicateMethodException.java

@@ -0,0 +1,7 @@
+package com.relogiclabs.jschema.exception;
+
+public class DuplicateMethodException extends BaseRuntimeException {
+    public DuplicateMethodException(String code, String message) {
+        super(code, message);
+    }
+}

src/main/java/com/relogiclabs/jschema/exception/FunctionArgumentTypeException.java

@@ -6,9 +6,8 @@
 import static com.relogiclabs.jschema.message.MessageFormatter.formatForSchema;
 
 public class FunctionArgumentTypeException extends ArgumentTypeException {
-    FunctionArgumentTypeException(ArgumentTypeException cause) {
-        super(cause.getCode(), cause.getMessage(), cause);
-        setParameter(cause.getParameter());
+    public FunctionArgumentTypeException(String code, String message) {
+        super(code, message);
     }
 
     public FunctionArgumentTypeException(ErrorDetail detail, Throwable cause) {

src/main/java/com/relogiclabs/jschema/exception/FunctionArgumentValueException.java

@@ -6,11 +6,6 @@
 import static com.relogiclabs.jschema.message.MessageFormatter.formatForSchema;
 
 public class FunctionArgumentValueException extends ArgumentValueException {
-    FunctionArgumentValueException(ArgumentValueException cause) {
-        super(cause.getCode(), cause.getMessage(), cause);
-        setParameter(cause.getParameter());
-    }
-
     public FunctionArgumentValueException(ErrorDetail detail) {
         super(detail, null);
     }

src/main/java/com/relogiclabs/jschema/exception/InvalidArgumentException.java

@@ -2,40 +2,22 @@
 
 import com.relogiclabs.jschema.message.ErrorDetail;
 import com.relogiclabs.jschema.type.EValue;
-import lombok.Getter;
-import lombok.Setter;
 
-@Getter @Setter
-public abstract class InvalidArgumentException extends InvocationRuntimeException {
-    private String parameter;
-
-    public InvalidArgumentException(String message) {
-        super(message);
-    }
-
-    public InvalidArgumentException(String code, String message, Throwable cause) {
-        super(code, message, cause);
+public class InvalidArgumentException extends InvocationRuntimeException {
+    public InvalidArgumentException(String code, String message) {
+        super(code, message);
     }
 
     public InvalidArgumentException(ErrorDetail detail, Throwable cause) {
         super(detail, cause);
     }
 
-    public void setContext(String code, String parameter) {
-        setCode(code);
-        this.parameter = parameter;
-    }
-
-    public abstract InvalidArgumentException failWithFunctionException();
-    public abstract InvalidArgumentException failWithMethodException(EValue self);
-
     protected String formatMethodMessage(EValue self) {
-        return getMessage() + " for parameter '" + parameter
-            + "' in method '" + getSubject() + "' of " + self.getType();
+        return addNative(getMessage() + " of method '" + getSubject()
+            + "' in " + self.getType());
     }
 
     protected String formatFunctionMessage() {
-        return getMessage() + " for parameter '" + parameter
-            + "' of function '" + getSubject() + "'";
+        return addNative(getMessage() + " of function '" + getSubject() + "'");
     }
 }