clean up

Author: miles-grant-ibigroup

src/main/java/com/conveyal/datatools/manager/models/Deployment.java

@@ -446,17 +446,12 @@ public byte[] generateBuildConfig() throws IOException {
     }
 
     public String generateBuildConfigAsString() {
-        if (customBuildConfig != null) return customBuildConfig;
-        return null;
-    }
-
-    /** Convenience method to write serializable object (primarily for router/build config objects) to byte array. */
-    private <O extends Serializable> byte[] writeToBytes(O object) {
         try {
-            return otpConfigMapper.writer().writeValueAsBytes(object);
-        } catch (JsonProcessingException e) {
-            LOG.error("Value contains malformed JSON", e);
-            return null;
+            return new String(generateBuildConfig(), StandardCharsets.UTF_8);
+            // TODO: Correctly generate default build config
+        } catch (Exception e) {
+            LOG.error("Failed to generate build config: ", e);
+            return "";
         }
     }
 
@@ -486,7 +481,8 @@ public byte[] generateRouterConfig() throws IOException {
     public String generateRouterConfigAsString() {
             try {
                 return new String(generateRouterConfig(), StandardCharsets.UTF_8);
-            } catch (IOException e) {
+                // TODO: Correctly generate default router config
+            } catch (Exception e) {
                 LOG.error("Failed to generate router config: ", e);
                 return "";
         }

src/main/java/com/conveyal/datatools/manager/models/OtpBuildConfig.java

@@ -6,6 +6,8 @@
 
 /**
  * Created by demory on 3/8/15.
+ *
+ * TODO: Figure out how to remove this class without causing problems in the DB migration
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class OtpBuildConfig implements Serializable {

src/main/java/com/conveyal/datatools/manager/models/OtpRouterConfig.java

@@ -7,6 +7,8 @@
 
 /**
  * Created by demory on 3/8/15.
+ *
+ * TODO: Figure out how to remove this class without causing problems in the DB migration
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class OtpRouterConfig implements Serializable {