Skip to content

Ensure config is present and not null #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 4, 2022
Merged

Ensure config is present and not null #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bf4a45
Ensure config is present and not null
Zabuzard Sep 30, 2022
470e995
token is also required
Zabuzard Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 42 additions & 34 deletions application/src/main/java/org/togetherjava/tjbot/config/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.nio.file.Path;
import java.util.Collections;
import java.util.List;
import java.util.Objects;

/**
* Configuration of the application. Create instances using {@link #load(Path)}.
Expand All @@ -35,40 +36,47 @@ public final class Config {

@SuppressWarnings("ConstructorWithTooManyParameters")
@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
private Config(@JsonProperty("token") String token,
@JsonProperty("gistApiKey") String gistApiKey,
@JsonProperty("databasePath") String databasePath,
@JsonProperty("projectWebsite") String projectWebsite,
@JsonProperty("discordGuildInvite") String discordGuildInvite,
@JsonProperty("modAuditLogChannelPattern") String modAuditLogChannelPattern,
@JsonProperty("mutedRolePattern") String mutedRolePattern,
@JsonProperty("heavyModerationRolePattern") String heavyModerationRolePattern,
@JsonProperty("softModerationRolePattern") String softModerationRolePattern,
@JsonProperty("tagManageRolePattern") String tagManageRolePattern,
@JsonProperty("suggestions") SuggestionsConfig suggestions,
@JsonProperty("quarantinedRolePattern") String quarantinedRolePattern,
@JsonProperty("scamBlocker") ScamBlockerConfig scamBlocker,
@JsonProperty("wolframAlphaAppId") String wolframAlphaAppId,
@JsonProperty("helpSystem") HelpSystemConfig helpSystem,
@JsonProperty("mediaOnlyChannelPattern") String mediaOnlyChannelPattern,
@JsonProperty("blacklistedFileExtension") List<String> blacklistedFileExtension) {
this.token = token;
this.gistApiKey = gistApiKey;
this.databasePath = databasePath;
this.projectWebsite = projectWebsite;
this.discordGuildInvite = discordGuildInvite;
this.modAuditLogChannelPattern = modAuditLogChannelPattern;
this.mutedRolePattern = mutedRolePattern;
this.heavyModerationRolePattern = heavyModerationRolePattern;
this.softModerationRolePattern = softModerationRolePattern;
this.tagManageRolePattern = tagManageRolePattern;
this.suggestions = suggestions;
this.quarantinedRolePattern = quarantinedRolePattern;
this.scamBlocker = scamBlocker;
this.wolframAlphaAppId = wolframAlphaAppId;
this.helpSystem = helpSystem;
this.mediaOnlyChannelPattern = mediaOnlyChannelPattern;
this.blacklistedFileExtension = blacklistedFileExtension;
private Config(@JsonProperty(value = "token", required = true) String token,
@JsonProperty(value = "gistApiKey", required = true) String gistApiKey,
@JsonProperty(value = "databasePath", required = true) String databasePath,
@JsonProperty(value = "projectWebsite", required = true) String projectWebsite,
@JsonProperty(value = "discordGuildInvite", required = true) String discordGuildInvite,
@JsonProperty(value = "modAuditLogChannelPattern",
required = true) String modAuditLogChannelPattern,
@JsonProperty(value = "mutedRolePattern", required = true) String mutedRolePattern,
@JsonProperty(value = "heavyModerationRolePattern",
required = true) String heavyModerationRolePattern,
@JsonProperty(value = "softModerationRolePattern",
required = true) String softModerationRolePattern,
@JsonProperty(value = "tagManageRolePattern",
required = true) String tagManageRolePattern,
@JsonProperty(value = "suggestions", required = true) SuggestionsConfig suggestions,
@JsonProperty(value = "quarantinedRolePattern",
required = true) String quarantinedRolePattern,
@JsonProperty(value = "scamBlocker", required = true) ScamBlockerConfig scamBlocker,
@JsonProperty(value = "wolframAlphaAppId", required = true) String wolframAlphaAppId,
@JsonProperty(value = "helpSystem", required = true) HelpSystemConfig helpSystem,
@JsonProperty(value = "mediaOnlyChannelPattern",
required = true) String mediaOnlyChannelPattern,
@JsonProperty(value = "blacklistedFileExtension",
required = true) List<String> blacklistedFileExtension) {
this.token = Objects.requireNonNull(token);
this.gistApiKey = Objects.requireNonNull(gistApiKey);
this.databasePath = Objects.requireNonNull(databasePath);
this.projectWebsite = Objects.requireNonNull(projectWebsite);
this.discordGuildInvite = Objects.requireNonNull(discordGuildInvite);
this.modAuditLogChannelPattern = Objects.requireNonNull(modAuditLogChannelPattern);
this.mutedRolePattern = Objects.requireNonNull(mutedRolePattern);
this.heavyModerationRolePattern = Objects.requireNonNull(heavyModerationRolePattern);
this.softModerationRolePattern = Objects.requireNonNull(softModerationRolePattern);
this.tagManageRolePattern = Objects.requireNonNull(tagManageRolePattern);
this.suggestions = Objects.requireNonNull(suggestions);
this.quarantinedRolePattern = Objects.requireNonNull(quarantinedRolePattern);
this.scamBlocker = Objects.requireNonNull(scamBlocker);
this.wolframAlphaAppId = Objects.requireNonNull(wolframAlphaAppId);
this.helpSystem = Objects.requireNonNull(helpSystem);
this.mediaOnlyChannelPattern = Objects.requireNonNull(mediaOnlyChannelPattern);
this.blacklistedFileExtension = Objects.requireNonNull(blacklistedFileExtension);
}

/**
Expand Down
22 changes: 13 additions & 9 deletions application/src/main/java/org/togetherjava/tjbot/config/HelpSystemConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;

/**
* Configuration for the help system, see {@link org.togetherjava.tjbot.commands.help.AskCommand}.
*/
@SuppressWarnings("ClassCanBeRecord")
@JsonRootName("helpSystem")
public final class HelpSystemConfig {
private final String stagingChannelPattern;
Expand All @@ -20,14 +20,18 @@ public final class HelpSystemConfig {
private final String categoryRoleSuffix;

@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
private HelpSystemConfig(@JsonProperty("stagingChannelPattern") String stagingChannelPattern,
@JsonProperty("overviewChannelPattern") String overviewChannelPattern,
@JsonProperty("categories") List<String> categories,
@JsonProperty("categoryRoleSuffix") String categoryRoleSuffix) {
this.stagingChannelPattern = stagingChannelPattern;
this.overviewChannelPattern = overviewChannelPattern;
this.categories = new ArrayList<>(categories);
this.categoryRoleSuffix = categoryRoleSuffix;
private HelpSystemConfig(
@JsonProperty(value = "stagingChannelPattern",
required = true) String stagingChannelPattern,
@JsonProperty(value = "overviewChannelPattern",
required = true) String overviewChannelPattern,
@JsonProperty(value = "categories", required = true) List<String> categories,
@JsonProperty(value = "categoryRoleSuffix",
required = true) String categoryRoleSuffix) {
this.stagingChannelPattern = Objects.requireNonNull(stagingChannelPattern);
this.overviewChannelPattern = Objects.requireNonNull(overviewChannelPattern);
this.categories = new ArrayList<>(Objects.requireNonNull(categories));
this.categoryRoleSuffix = Objects.requireNonNull(categoryRoleSuffix);
}

/**
Expand Down
27 changes: 15 additions & 12 deletions application/src/main/java/org/togetherjava/tjbot/config/ScamBlockerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

import java.util.Collections;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;

/**
* Configuration for the scam blocker system, see
* {@link org.togetherjava.tjbot.commands.moderation.scam.ScamBlocker}.
*/
@SuppressWarnings("ClassCanBeRecord")
@JsonRootName("scamBlocker")
public final class ScamBlockerConfig {
private final Mode mode;
Expand All @@ -23,17 +23,20 @@ public final class ScamBlockerConfig {
private final int isHostSimilarToKeywordDistanceThreshold;

@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
private ScamBlockerConfig(@JsonProperty("mode") Mode mode,
@JsonProperty("reportChannelPattern") String reportChannelPattern,
@JsonProperty("hostWhitelist") Set<String> hostWhitelist,
@JsonProperty("hostBlacklist") Set<String> hostBlacklist,
@JsonProperty("suspiciousHostKeywords") Set<String> suspiciousHostKeywords,
@JsonProperty("isHostSimilarToKeywordDistanceThreshold") int isHostSimilarToKeywordDistanceThreshold) {
this.mode = mode;
this.reportChannelPattern = reportChannelPattern;
this.hostWhitelist = new HashSet<>(hostWhitelist);
this.hostBlacklist = new HashSet<>(hostBlacklist);
this.suspiciousHostKeywords = new HashSet<>(suspiciousHostKeywords);
private ScamBlockerConfig(@JsonProperty(value = "mode", required = true) Mode mode,
@JsonProperty(value = "reportChannelPattern",
required = true) String reportChannelPattern,
@JsonProperty(value = "hostWhitelist", required = true) Set<String> hostWhitelist,
@JsonProperty(value = "hostBlacklist", required = true) Set<String> hostBlacklist,
@JsonProperty(value = "suspiciousHostKeywords",
required = true) Set<String> suspiciousHostKeywords,
@JsonProperty(value = "isHostSimilarToKeywordDistanceThreshold",
required = true) int isHostSimilarToKeywordDistanceThreshold) {
this.mode = Objects.requireNonNull(mode);
this.reportChannelPattern = Objects.requireNonNull(reportChannelPattern);
this.hostWhitelist = new HashSet<>(Objects.requireNonNull(hostWhitelist));
this.hostBlacklist = new HashSet<>(Objects.requireNonNull(hostBlacklist));
this.suspiciousHostKeywords = new HashSet<>(Objects.requireNonNull(suspiciousHostKeywords));
this.isHostSimilarToKeywordDistanceThreshold = isHostSimilarToKeywordDistanceThreshold;
}

Expand Down
16 changes: 9 additions & 7 deletions application/src/main/java/org/togetherjava/tjbot/config/SuggestionsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,26 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;

import java.util.Objects;

/**
* Configuration for the suggestion system, see
* {@link org.togetherjava.tjbot.commands.basic.SuggestionsUpDownVoter}.
*/
@SuppressWarnings("ClassCanBeRecord")
@JsonRootName("suggestions")
public final class SuggestionsConfig {
private final String channelPattern;
private final String upVoteEmoteName;
private final String downVoteEmoteName;

@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
private SuggestionsConfig(@JsonProperty("channelPattern") String channelPattern,
@JsonProperty("upVoteEmoteName") String upVoteEmoteName,
@JsonProperty("downVoteEmoteName") String downVoteEmoteName) {
this.channelPattern = channelPattern;
this.upVoteEmoteName = upVoteEmoteName;
this.downVoteEmoteName = downVoteEmoteName;
private SuggestionsConfig(
@JsonProperty(value = "channelPattern", required = true) String channelPattern,
@JsonProperty(value = "upVoteEmoteName", required = true) String upVoteEmoteName,
@JsonProperty(value = "downVoteEmoteName", required = true) String downVoteEmoteName) {
this.channelPattern = Objects.requireNonNull(channelPattern);
this.upVoteEmoteName = Objects.requireNonNull(upVoteEmoteName);
this.downVoteEmoteName = Objects.requireNonNull(downVoteEmoteName);
}

/**
Expand Down