mirror of
https://github.com/Sheldan/abstracto.git
synced 2026-04-19 13:10:20 +00:00
updated javadoc for experience tracking
added/changed some javadoc for mod mail some small interface changes changed a few methods to actually use the exists mechanic, instead of checking for null values added some templates instead of hard coded strings fixed some bugs related to mod mail
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
package dev.sheldan.abstracto.core.service;
|
||||
|
||||
import dev.sheldan.abstracto.core.config.PostTargetEnum;
|
||||
import dev.sheldan.abstracto.core.models.EmoteMissingValidationError;
|
||||
import dev.sheldan.abstracto.core.models.EmoteMissingValidationErrorModel;
|
||||
import dev.sheldan.abstracto.core.models.FeatureValidationResult;
|
||||
import dev.sheldan.abstracto.core.models.PostTargetValidationError;
|
||||
import dev.sheldan.abstracto.core.models.SystemConfigValidationError;
|
||||
import dev.sheldan.abstracto.core.models.PostTargetValidationErrorModel;
|
||||
import dev.sheldan.abstracto.core.models.SystemConfigValidationErrorModel;
|
||||
import dev.sheldan.abstracto.core.models.database.AEmote;
|
||||
import dev.sheldan.abstracto.core.models.database.AServer;
|
||||
import dev.sheldan.abstracto.core.service.management.ConfigManagementService;
|
||||
@@ -38,18 +38,18 @@ public class FeatureValidationServiceBean implements FeatureValidatorService {
|
||||
@Override
|
||||
public void checkPostTarget(PostTargetEnum name, AServer server, FeatureValidationResult featureValidationResult) {
|
||||
if(!postTargetManagement.postTargetExists(name.getKey(), server)) {
|
||||
PostTargetValidationError validationError = PostTargetValidationError.builder().postTargetName(name.getKey()).build();
|
||||
PostTargetValidationErrorModel validationError = PostTargetValidationErrorModel.builder().postTargetName(name.getKey()).build();
|
||||
featureValidationResult.setValidationResult(false);
|
||||
featureValidationResult.getValidationErrors().add(validationError);
|
||||
featureValidationResult.getValidationErrorModels().add(validationError);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean checkSystemConfig(String name, AServer server, FeatureValidationResult featureValidationResult) {
|
||||
if(!configService.configExists(server, name)) {
|
||||
SystemConfigValidationError validationError = SystemConfigValidationError.builder().configKey(name).build();
|
||||
SystemConfigValidationErrorModel validationError = SystemConfigValidationErrorModel.builder().configKey(name).build();
|
||||
featureValidationResult.setValidationResult(false);
|
||||
featureValidationResult.getValidationErrors().add(validationError);
|
||||
featureValidationResult.getValidationErrorModels().add(validationError);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -79,9 +79,9 @@ public class FeatureValidationServiceBean implements FeatureValidatorService {
|
||||
}
|
||||
|
||||
private void rejectEmote(String emoteKey, FeatureValidationResult featureValidationResult) {
|
||||
EmoteMissingValidationError validationError = EmoteMissingValidationError.builder().emoteKey(emoteKey).build();
|
||||
EmoteMissingValidationErrorModel validationError = EmoteMissingValidationErrorModel.builder().emoteKey(emoteKey).build();
|
||||
featureValidationResult.setValidationResult(false);
|
||||
featureValidationResult.getValidationErrors().add(validationError);
|
||||
featureValidationResult.getValidationErrorModels().add(validationError);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ import java.util.HashMap;
|
||||
@Getter
|
||||
@Setter
|
||||
@Builder
|
||||
public class EmoteMissingValidationError implements ValidationError {
|
||||
public class EmoteMissingValidationErrorModel implements ValidationErrorModel {
|
||||
|
||||
private String emoteKey;
|
||||
|
||||
@@ -18,7 +18,7 @@ public class FeatureValidationResult implements Templatable {
|
||||
private FeatureConfig feature;
|
||||
private Boolean validationResult;
|
||||
@Builder.Default
|
||||
private List<ValidationError> validationErrors = new ArrayList<>();
|
||||
private List<ValidationErrorModel> validationErrorModels = new ArrayList<>();
|
||||
|
||||
public static FeatureValidationResult validationSuccessful(FeatureConfig featureConfig) {
|
||||
return FeatureValidationResult
|
||||
@@ -37,7 +37,7 @@ public class FeatureValidationResult implements Templatable {
|
||||
public Object getTemplateModel() {
|
||||
HashMap<String, Object> params = new HashMap<>();
|
||||
params.put("featureTemplate", this.feature.getFeature().getKey() + "_feature");
|
||||
params.put("errors", this.validationErrors);
|
||||
params.put("errors", this.validationErrorModels);
|
||||
return params;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import java.util.HashMap;
|
||||
@Getter
|
||||
@Setter
|
||||
@Builder
|
||||
public class PostTargetValidationError implements ValidationError {
|
||||
public class PostTargetValidationErrorModel implements ValidationErrorModel {
|
||||
|
||||
private String postTargetName;
|
||||
|
||||
@@ -9,7 +9,7 @@ import java.util.HashMap;
|
||||
@Getter
|
||||
@Setter
|
||||
@Builder
|
||||
public class SystemConfigValidationError implements ValidationError {
|
||||
public class SystemConfigValidationErrorModel implements ValidationErrorModel {
|
||||
|
||||
private String configKey;
|
||||
|
||||
@@ -2,5 +2,5 @@ package dev.sheldan.abstracto.core.models;
|
||||
|
||||
import dev.sheldan.abstracto.templating.Templatable;
|
||||
|
||||
public interface ValidationError extends Templatable {
|
||||
public interface ValidationErrorModel extends Templatable {
|
||||
}
|
||||
Reference in New Issue
Block a user