use a basic if statement instead of preconditions

HubSpot · Nov 10, 2015 · a8485b6 · a8485b6
1 parent 6ff5b2d
commit a8485b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...Base/src/main/java/com/hubspot/singularity/runner/base/config/MissingConfigException.java b/...Base/src/main/java/com/hubspot/singularity/runner/base/config/MissingConfigException.java
@@ -1,7 +1,7 @@
 package com.hubspot.singularity.runner.base.config;
 
 public class MissingConfigException extends IllegalStateException {
-  public MissingConfigException(Exception e) {
+  public MissingConfigException(String message) {
-    super(e);
+    super(message);
   }
 }
diff --git a/...ploader/src/main/java/com/hubspot/singularity/s3uploader/SingularityS3UploaderDriver.java b/...ploader/src/main/java/com/hubspot/singularity/s3uploader/SingularityS3UploaderDriver.java
@@ -127,11 +127,11 @@ private void readInitialFiles() throws IOException {
 
   @Override
   public void startAndWait() {
-    try {
+    if (!configuration.getS3AccessKey().or(s3Configuration.getS3AccessKey()).isPresent()) {
-      Preconditions.checkState(configuration.getS3AccessKey().or(s3Configuration.getS3AccessKey()).isPresent(), "s3AccessKey not set in any s3 configs!");
+      throw new MissingConfigException("s3AccessKey not set in any s3 configs!");
-      Preconditions.checkState(configuration.getS3SecretKey().or(s3Configuration.getS3SecretKey()).isPresent(), "s3SecretKey not set in any s3 configs!");
+    }
-    } catch (IllegalStateException ise) {
+    if (!configuration.getS3SecretKey().or(s3Configuration.getS3SecretKey()).isPresent()) {
-      throw new MissingConfigException(ise);
+      throw new MissingConfigException("s3SecretKey not set in any s3 configs!");
     }
 
     try {