Change config from Properties to JSON #1726

opentripplanner · Feb 2, 2015 · 07efeeb · 07efeeb
1 parent decec6d
commit 07efeeb
Show file tree

Hide file tree

Showing 38 changed files with 236 additions and 932 deletions.
diff --git a/src/main/java/org/opentripplanner/common/OTPConfigPreferences.java b/src/main/java/org/opentripplanner/common/OTPConfigPreferences.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/impl/EmbeddedConfigGraphBuilderImpl.java b/src/main/java/org/opentripplanner/graph_builder/impl/EmbeddedConfigGraphBuilderImpl.java
diff --git a/src/main/java/org/opentripplanner/routing/graph/Graph.java b/src/main/java/org/opentripplanner/routing/graph/Graph.java
@@ -40,6 +40,7 @@ the License, or (at your option) any later version.
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.prefs.Preferences;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.*;
 import org.joda.time.DateTime;
 import org.onebusaway.gtfs.impl.calendar.CalendarServiceImpl;
@@ -162,7 +163,7 @@ public class Graph implements Serializable {
     /**
      * Makes it possible to embed a default configuration inside a graph.
      */
-    public Properties embeddedPreferences = null;
+    public JsonNode embeddedPreferences = null;
 
     /* The preferences that were used for graph building. */
     public Preferences preferences = null;