Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-07 09:38:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-143] fixing incorrect parameter exception message, replacing incorrect parameter exception

Browse Source
This commit is contained in:
Sheldan
2020-10-07 15:15:16 +02:00
parent 0145e7670d
commit b8d19ab1e1
36 changed files with 82 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/AbstractConditionableCommand.java
View File

@@ -1,7 +1,7 @@
package dev.sheldan.abstracto.core.command.condition;
import dev.sheldan.abstracto.core.command.config.Parameter;
import dev.sheldan.abstracto.core.command.exception.IncorrectParameterException;
import dev.sheldan.abstracto.core.command.exception.IncorrectParameterTypeException;
import dev.sheldan.abstracto.core.command.exception.InsufficientParametersException;
import dev.sheldan.abstracto.core.command.execution.CommandContext;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +52,7 @@ public abstract class AbstractConditionableCommand implements ConditionalCommand
if(context.getParameters() != null && context.getParameters().getParameters() != null && context.getParameters().getParameters().size() >= i) {
boolean parameterIsPresent = i < context.getParameters().getParameters().size();
if(parameterIsPresent && !desiredType.isInstance(context.getParameters().getParameters().get(i))) {
throw new IncorrectParameterException(this, desiredType, parameter.getName());
throw new IncorrectParameterTypeException(this, desiredType, parameter.getName());
}
}
}
@@ -62,7 +62,7 @@ public abstract class AbstractConditionableCommand implements ConditionalCommand
throw new InsufficientParametersException(this, parameter.getName());
}
if(!desiredType.isInstance(context.getParameters().getParameters().get(i))) {
throw new IncorrectParameterException(this, desiredType, parameter.getName());
throw new IncorrectParameterTypeException(this, desiredType, parameter.getName());
}
}
}

4
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/IncorrectParameterException.java
View File

@@ -9,9 +9,9 @@ public class IncorrectParameterException extends AbstractoRunTimeException imple
private final IncorrectParameterExceptionModel model;
public IncorrectParameterException(Command command, Class expected, String parameterName) {
public IncorrectParameterException(Command command, String parameterName) {
super("Incorrect parameter given for parameter");
this.model = IncorrectParameterExceptionModel.builder().clazz(expected).parameterName(parameterName).command(command).build();
this.model = IncorrectParameterExceptionModel.builder().parameterName(parameterName).command(command).build();
}
@Override

11
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/IncorrectParameterTypeException.java Normal file
View File

@@ -0,0 +1,11 @@
package dev.sheldan.abstracto.core.command.exception;
import dev.sheldan.abstracto.core.command.Command;
import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
public class IncorrectParameterTypeException extends AbstractoRunTimeException {
public IncorrectParameterTypeException(Command command, Class clazz, String parameterName) {
super(String.format("Incorrect parameter given for parameter. Expected %s for parameter %s in command %s.", clazz.getName(), parameterName, command.getConfiguration().getName()));
}
}

1
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/exception/IncorrectParameterExceptionModel.java
View File

@@ -11,5 +11,4 @@ import java.io.Serializable;
public class IncorrectParameterExceptionModel implements Serializable {
private final transient Command command;
private final String parameterName;
private final Class clazz;
}