Skip to content

Commit 392d77f

Browse files
committed
More code review
1 parent f66e16c commit 392d77f

File tree

3 files changed

+24
-8
lines changed

3 files changed

+24
-8
lines changed

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin-common/src/main/java/dev/jorel/commandapi/config/BukkitConfigurationAdapter.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.bukkit.configuration.file.YamlConfiguration;
66

77
import java.io.File;
8+
import java.io.IOException;
89
import java.util.ArrayList;
910
import java.util.Arrays;
1011
import java.util.HashSet;
@@ -112,12 +113,15 @@ public ConfigurationAdapter<YamlConfiguration> createNew() {
112113
public void saveDefaultConfig(File directory, File configFile, Logger logger) {
113114
ConfigGenerator configGenerator = ConfigGenerator.createNew(DefaultBukkitConfig.createDefault());
114115
if (!directory.exists()) {
115-
directory.mkdir();
116+
boolean createdDirectory = directory.mkdirs();
117+
if (!createdDirectory) {
118+
logger.severe("Failed to create directory for the CommandAPI's config.yml file!");
119+
}
116120
try {
117121
ConfigurationAdapter<YamlConfiguration> bukkitConfigurationAdapter = new BukkitConfigurationAdapter(new YamlConfiguration());
118122
configGenerator.populateDefaultConfig(bukkitConfigurationAdapter);
119123
bukkitConfigurationAdapter.config().save(configFile);
120-
} catch (Exception e) {
124+
} catch (IOException e) {
121125
logger.severe("Could not create default config file! This is (probably) a bug.");
122126
logger.severe("Error message: " + e.getMessage());
123127
logger.severe("Stacktrace:");
@@ -136,7 +140,7 @@ public void saveDefaultConfig(File directory, File configFile, Logger logger) {
136140
return;
137141
}
138142
updatedConfig.config().save(configFile);
139-
} catch (Exception e) {
143+
} catch (IOException e) {
140144
logger.severe("Could not update config! This is (probably) a bug.");
141145
logger.severe("Error message: " + e.getMessage());
142146
logger.severe("Stacktrace:");

commandapi-platforms/commandapi-velocity/commandapi-velocity-plugin/src/main/java/dev/jorel/commandapi/CommandAPIMain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public CommandAPIMain(ProxyServer server, Logger logger, @DataDirectory Path dat
3636
Path configFile = dataDirectory.resolve("config.yml");
3737

3838
// Create or update config
39-
VelocityConfigurationAdapter.createDummyInstance().saveDefaultConfig(configFile.getParent().toFile(), configFile.toFile(), null);
39+
VelocityConfigurationAdapter.createDummyInstance().saveDefaultConfig(configFile.getParent().toFile(), configFile.toFile(), logger);
4040

4141
// Load the file as a yaml node
4242
ConfigurationNode configYAML;

commandapi-platforms/commandapi-velocity/commandapi-velocity-plugin/src/main/java/dev/jorel/commandapi/config/VelocityConfigurationAdapter.java

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,21 @@ public void saveDefaultConfig(File directory, File configFile, Logger logger) {
9797
DefaultVelocityConfig defaultConfig = DefaultVelocityConfig.createDefault();
9898
ConfigGenerator configGenerator = ConfigGenerator.createNew(defaultConfig);
9999
if (!directory.exists()) {
100-
directory.mkdirs();
101-
100+
boolean createdDirectory = directory.mkdirs();
101+
if (!createdDirectory) {
102+
logger.severe("Failed to create directory for the CommandAPI's config.yml file!");
103+
}
102104
try {
103105
ConfigurationAdapter<ConfigurationNode> velocityConfigurationAdapter = new VelocityConfigurationAdapter(configLoader, configLoader.createNode(), defaultConfig);
104106
configGenerator.populateDefaultConfig(velocityConfigurationAdapter);
105107
configLoader.save(velocityConfigurationAdapter.config());
106108
} catch (IOException e) {
107-
throw new RuntimeException(e);
109+
logger.severe("Could not create default config file! This is (probably) a bug.");
110+
logger.severe("Error message: " + e.getMessage());
111+
logger.severe("Stacktrace:");
112+
for (StackTraceElement element : e.getStackTrace()) {
113+
logger.severe(element.toString());
114+
}
108115
}
109116
} else {
110117
try {
@@ -116,7 +123,12 @@ public void saveDefaultConfig(File directory, File configFile, Logger logger) {
116123
configLoader.save(updatedConfig.config());
117124
}
118125
} catch (IOException e) {
119-
throw new RuntimeException(e);
126+
logger.severe("Could not update config! This is (probably) a bug.");
127+
logger.severe("Error message: " + e.getMessage());
128+
logger.severe("Stacktrace:");
129+
for (StackTraceElement element : e.getStackTrace()) {
130+
logger.severe(element.toString());
131+
}
120132
}
121133
}
122134
}

0 commit comments

Comments
 (0)