Add a way to load config from external paths

manusant · Aug 13, 2022 · 174dc2d · 174dc2d
1 parent 589e507
commit 174dc2d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/demo/src/main/resources/conf/spark-swagger.conf b/demo/src/main/resources/conf/spark-swagger.conf
@@ -18,7 +18,7 @@ spark-swagger {
 
 
   # API related configs
-  host = "localhost:8081"
+  host = "localhost:8082"
   basePath = "/thor"
   info {
     version = "1.0.2"

diff --git a/spark-swagger/src/main/java/io/github/manusant/ss/SparkSwagger.java b/spark-swagger/src/main/java/io/github/manusant/ss/SparkSwagger.java
@@ -17,6 +17,7 @@
 import spark.HaltException;
 import spark.Service;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
@@ -43,7 +44,7 @@ private SparkSwagger(final Service spark, final Options options) {
         this.spark = spark;
         this.options = options == null ? Options.defaultOptions().build() : options;
         this.swagger = new Swagger();
-        this.config = ConfigFactory.parseResources(Objects.requireNonNull(options).getConfPath());
+        this.config = getConfig(options);
         this.apiPath = this.config.getString("spark-swagger.basePath");
         this.swagger.setBasePath(this.apiPath);
         this.swagger.setExternalDocs(ExternalDocs.newBuilder().build());
@@ -52,6 +53,14 @@ private SparkSwagger(final Service spark, final Options options) {
         configDocRoute();
     }
 
+    private Config getConfig(Options options) {
+        Config config = ConfigFactory.parseResources(Objects.requireNonNull(options).getConfPath());
+        if (!config.hasPath("spark-swagger")) {
+            config = ConfigFactory.parseFile(new File(Objects.requireNonNull(options).getConfPath()));
+        }
+        return config;
+    }
+
     public String getApiPath() {
         return apiPath;
     }