Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-03-10 17:32:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged exceptions for setup steps to one common exception, which contains the concrete exception

Browse Source 
added exception handling for incorrect mod mail category id
This commit is contained in:
Sheldan
2020-05-26 11:48:12 +02:00
parent 158d957eee
commit a682428028
15 changed files with 33 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/setup/InvalidCategoryException.java Normal file
View File

@@ -0,0 +1,20 @@
package dev.sheldan.abstracto.modmail.setup;
import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
import dev.sheldan.abstracto.templating.Templatable;
public class InvalidCategoryException extends AbstractoRunTimeException implements Templatable {
public InvalidCategoryException() {
super("");
}
@Override
public String getTemplateName() {
return "setup_category_not_valid_exception";
}
@Override
public Object getTemplateModel() {
return new Object();
}
}

4
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/setup/ModMailCategorySetupBean.java
View File

@@ -109,7 +109,7 @@ public class ModMailCategorySetupBean implements ModMailCategorySetup {
.delayedActionConfigList(delayedSteps)
.build();
} else {
throw new AbstractoRunTimeException("Category id does not conform.");
throw new InvalidCategoryException();
}
}
@@ -117,7 +117,7 @@ public class ModMailCategorySetupBean implements ModMailCategorySetup {
future.complete(result);
} catch (Exception e) {
log.error("Failed to handle post target step.", e);
future.completeExceptionally(e);
future.completeExceptionally(new SetupStepException(e));
}
};
interactiveService.createMessageWithResponse(messageText, aUserInAServer, channel.get(), parameter.getPreviousMessageId(), configAction, finalAction);

1
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/exception/setup_category_not_valid_exception_en_US.ftl Normal file
View File

@@ -0,0 +1 @@
<#include "setup_category_not_valid_exception_message">

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/PostTargetSetupStep.java
View File

@@ -105,7 +105,7 @@ public class PostTargetSetupStep extends AbstractConfigSetupStep {
future.complete(result);
} catch (Exception e) {
log.error("Failed to handle post target step.", e);
future.completeExceptionally(new PostTargetStepException(e));
future.completeExceptionally(new SetupStepException(e));
}
};
interactiveService.createMessageWithResponse(messageText, aUserInAServer, channel.get(), parameter.getPreviousMessageId(), configAction, finalAction);

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SystemConfigSetupStep.java
View File

@@ -95,7 +95,7 @@ public class SystemConfigSetupStep extends AbstractConfigSetupStep {
future.complete(result);
} catch (Exception e) {
log.warn("Failed to handle system config. Retrying..", e);
future.completeExceptionally(new SystemConfigStepException(e));
future.completeExceptionally(new SetupStepException(e));
}
};
interactiveService.createMessageWithResponse(messageText, aUserInAServer, channel.get(), parameter.getPreviousMessageId(), configAction, finalAction);

27
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SystemConfigStepException.java
View File

@@ -1,27 +0,0 @@
package dev.sheldan.abstracto.core.interactive;
import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
import dev.sheldan.abstracto.templating.Templatable;
import java.util.HashMap;
public class SystemConfigStepException extends AbstractoRunTimeException implements Templatable {
public SystemConfigStepException(Throwable cause) {
super("", cause);
}
@Override
public String getTemplateName() {
return "setup_system_config_exception";
}
@Override
public Object getTemplateModel() {
HashMap<String, String> stringStringHashMap = new HashMap<>();
stringStringHashMap.put("message", getCause().getMessage());
return stringStringHashMap;
}
}

2
abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/setup_post_target_exception_en_US.ftl → abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/setup_step_exception_en_US.ftl
View File

@@ -1 +1 @@
<#assign text><#if templateKey?has_content><#assign exceptionModel=templateModel><#include "${templateKey}"><#else>${message}</#if></#assign><#include "setup_post_target_exception_text">
<#assign text><#if templateKey?has_content><#assign exceptionModel=templateModel><#include "${templateKey}"><#else>${message}</#if></#assign><#include "setup_step_exception_message">

1
abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/setup_system_config_exception_en_US.ftl
View File

@@ -1 +0,0 @@
<#include "setup_system_config_exception_text">

19
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/SetupStepException.java
View File

@@ -1,19 +0,0 @@
package dev.sheldan.abstracto.core.exception;
import dev.sheldan.abstracto.templating.Templatable;
public class SetupStepException extends AbstractoRunTimeException implements Templatable {
public SetupStepException(String message) {
super(message);
}
@Override
public String getTemplateName() {
return "setup_configuration_timeout";
}
@Override
public Object getTemplateModel() {
return new Object();
}
}

8
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/PostTargetStepException.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/interactive/SetupStepException.java
View File

@@ -5,14 +5,14 @@ import dev.sheldan.abstracto.templating.Templatable;
import java.util.HashMap;
public class PostTargetStepException extends AbstractoRunTimeException implements Templatable {
public PostTargetStepException(Throwable cause) {
super("", cause);
public class SetupStepException extends AbstractoRunTimeException implements Templatable {
public SetupStepException(Throwable throwable) {
super("", throwable);
}
@Override
public String getTemplateName() {
return "setup_post_target_exception";
return "setup_step_exception";
}
@Override

1
abstracto-application/template-config/src/main/resources/templates/en_US/core/exception/setup_post_target_exception_text_en_US.ftl
View File

@@ -1 +0,0 @@
Failed to configure post target: ${text}

1
abstracto-application/template-config/src/main/resources/templates/en_US/core/exception/setup_step_exception_message_en_US.ftl Normal file
View File

@@ -0,0 +1 @@
Failed to execute wizard step: ${text}

1
abstracto-application/template-config/src/main/resources/templates/en_US/core/exception/setup_system_config_exception_text_en_US.ftl
View File

@@ -1 +0,0 @@
Failed to configure system config: ${message}.

2
abstracto-application/template-config/src/main/resources/templates/en_US/modmail/config/setup_modmail_category_message_display_en_US.ftl
View File

@@ -1 +1 @@
The ID of the category you want to create the mod mail threads in. Currently: ${categoryName}
The ID of the category you want to create the mod mail threads in. Currently the used category is: ${categoryName}

1
abstracto-application/template-config/src/main/resources/templates/en_US/modmail/exception/setup_category_not_valid_exception_message_en_US.ftl Normal file
View File

@@ -0,0 +1 @@
The provided category ID is not valid.