mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix codacy problems

Browse source 
Avoid throwing raw exception types.

Combine nested if statements.
This commit is contained in:
ghubstan 2020-07-09 16:54:03 -03:00
parent 09929c833f
commit efbaa5be73
No known key found for this signature in database
GPG key ID: E35592D6800A861E
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java
View file

@ -299,7 +299,7 @@ public class ApiTestConfig {
installBitcoinBlocknotify(); installBitcoinBlocknotify();
} catch (OptionException ex) { } catch (OptionException ex) {
throw new RuntimeException(format("Problem parsing option '%s': %s", throw new IllegalStateException(format("Problem parsing option '%s': %s",
ex.options().get(0), ex.options().get(0),
ex.getCause() != null ? ex.getCause() != null ?
ex.getCause().getMessage() : ex.getCause().getMessage() :
@ -351,10 +351,8 @@ public class ApiTestConfig {
} }
private Optional<OptionSet> parseOptionsFrom(File configFile, OptionSpec<?>[] disallowedOpts) { private Optional<OptionSet> parseOptionsFrom(File configFile, OptionSpec<?>[] disallowedOpts) {
if (!configFile.exists()) { if (!configFile.exists() && !configFile.equals(absoluteConfigFile(userDir, DEFAULT_CONFIG_FILE_NAME)))
if (!configFile.equals(absoluteConfigFile(userDir, DEFAULT_CONFIG_FILE_NAME))) throw new IllegalStateException(format("The specified config file '%s' does not exist.", configFile));
throw new RuntimeException(format("The specified config file '%s' does not exist.", configFile));
}
Properties properties = getProperties(configFile); Properties properties = getProperties(configFile);
List<String> optionLines = new ArrayList<>(); List<String> optionLines = new ArrayList<>();
@ -365,7 +363,7 @@ public class ApiTestConfig {
OptionSet configFileOpts = parser.parse(optionLines.toArray(new String[0])); OptionSet configFileOpts = parser.parse(optionLines.toArray(new String[0]));
for (OptionSpec<?> disallowedOpt : disallowedOpts) for (OptionSpec<?> disallowedOpt : disallowedOpts)
if (configFileOpts.has(disallowedOpt)) if (configFileOpts.has(disallowedOpt))
throw new RuntimeException( throw new IllegalStateException(
format("The '%s' option is disallowed in config files", format("The '%s' option is disallowed in config files",
disallowedOpt.options().get(0))); disallowedOpt.options().get(0)));
@ -378,7 +376,7 @@ public class ApiTestConfig {
properties.load(new FileInputStream(configFile.getAbsolutePath())); properties.load(new FileInputStream(configFile.getAbsolutePath()));
return properties; return properties;
} catch (IOException ex) { } catch (IOException ex) {
throw new RuntimeException( throw new IllegalStateException(
format("Could not load properties from config file %s", format("Could not load properties from config file %s",
configFile.getAbsolutePath()), ex); configFile.getAbsolutePath()), ex);
} }
@ -400,7 +398,7 @@ public class ApiTestConfig {
FileUtil.renameFile(tempFile, file); FileUtil.renameFile(tempFile, file);
Files.setPosixFilePermissions(Paths.get(file.toURI()), PosixFilePermissions.fromString(posixFilePermissions)); Files.setPosixFilePermissions(Paths.get(file.toURI()), PosixFilePermissions.fromString(posixFilePermissions));
} catch (IOException ex) { } catch (IOException ex) {
throw new RuntimeException(format("Error saving %s/%s to disk", parentDir, relativeConfigFilePath), ex); throw new IllegalStateException(format("Error saving %s/%s to disk", parentDir, relativeConfigFilePath), ex);
} finally { } finally {
if (tempFile != null && tempFile.exists()) { if (tempFile != null && tempFile.exists()) {
log.warn("Temp file still exists after failed save; deleting {} now.", tempFile.getAbsolutePath()); log.warn("Temp file still exists after failed save; deleting {} now.", tempFile.getAbsolutePath());