From 416c618e38b592b3678b09aedbcf222cda110c86 Mon Sep 17 00:00:00 2001
From: Maximiliano Osorio <maxiosorio@gmail.com>
Date: Mon, 27 Apr 2020 13:14:18 -0700
Subject: [PATCH] fix:  Trailing slash in configuration #84

---
 examples/modelcatalog/config.yaml                    |  2 +-
 src/main/java/edu/isi/oba/Oba.java                   |  1 -
 src/main/java/edu/isi/oba/ObaUtils.java              |  4 ++++
 src/main/java/edu/isi/oba/SerializerPython.java      |  2 +-
 src/main/java/edu/isi/oba/config/EndpointConfig.java | 12 +++++++-----
 src/main/java/edu/isi/oba/config/YamlConfig.java     |  2 +-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/examples/modelcatalog/config.yaml b/examples/modelcatalog/config.yaml
index 479e758..820e0d3 100644
--- a/examples/modelcatalog/config.yaml
+++ b/examples/modelcatalog/config.yaml
@@ -23,7 +23,7 @@ firebase:
 
 endpoint:
   url: http://endpoint.mint.isi.edu/modelCatalog-1.4.0
-  prefix: https://w3id.org/okn/i/mint
+  prefix: https://w3id.org/okn/i/masd
   graph_base: http://endpoint.mint.isi.edu/modelCatalog-1.4.0/data/
 
 custom_queries_directory: examples/modelcatalog/custom_queries
diff --git a/src/main/java/edu/isi/oba/Oba.java b/src/main/java/edu/isi/oba/Oba.java
index 4781a43..59f0245 100644
--- a/src/main/java/edu/isi/oba/Oba.java
+++ b/src/main/java/edu/isi/oba/Oba.java
@@ -53,7 +53,6 @@ public static void main(String[] args) throws Exception {
     }
 
     String destination_dir = config_data.getOutput_dir() + File.separator + config_data.getName();
-    EndpointConfig endpoint_data = config_data.getEndpoint();
     FirebaseConfig firebase_data = config_data.getFirebase();
     AuthConfig authConfig = config_data.getAuth();
     if (authConfig != null) {
diff --git a/src/main/java/edu/isi/oba/ObaUtils.java b/src/main/java/edu/isi/oba/ObaUtils.java
index 0c4cb3c..fc83123 100644
--- a/src/main/java/edu/isi/oba/ObaUtils.java
+++ b/src/main/java/edu/isi/oba/ObaUtils.java
@@ -259,4 +259,8 @@ public static JSONObject read_json_file(String file_name) throws IOException {
         return jsonObject;
     }
 
+    public static String check_trailing_slash(String string) {
+        return string.endsWith("/") ? string : string + "/";
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/edu/isi/oba/SerializerPython.java b/src/main/java/edu/isi/oba/SerializerPython.java
index 8439fa0..05fcf8a 100644
--- a/src/main/java/edu/isi/oba/SerializerPython.java
+++ b/src/main/java/edu/isi/oba/SerializerPython.java
@@ -46,7 +46,7 @@ public SerializerPython(Mapper mapper,
 
     //Create the config.ini
     EndpointConfig endpoint_config = config.getEndpoint();
-    create_settings_file(endpoint_config.url, endpoint_config.prefix, endpoint_config.graph_base, config);
+    create_settings_file(endpoint_config.getUrl(), endpoint_config.getPrefix(), endpoint_config.getGraph_base(), config);
   }
 
   private void create_settings_file(String endpoint, String prefix, String graph_base, YamlConfig config){
diff --git a/src/main/java/edu/isi/oba/config/EndpointConfig.java b/src/main/java/edu/isi/oba/config/EndpointConfig.java
index 9bb0240..f492491 100644
--- a/src/main/java/edu/isi/oba/config/EndpointConfig.java
+++ b/src/main/java/edu/isi/oba/config/EndpointConfig.java
@@ -1,9 +1,11 @@
 package edu.isi.oba.config;
 
+import edu.isi.oba.ObaUtils;
+
 public class EndpointConfig {
-  public String url;
-  public String prefix;
-  public String graph_base;
+  private String url;
+  private String prefix;
+  private String graph_base;
 
   public String getUrl() {
     return url;
@@ -18,7 +20,7 @@ public String getPrefix() {
   }
 
   public void setPrefix(String prefix) {
-    this.prefix = prefix;
+    this.prefix = ObaUtils.check_trailing_slash(prefix);
   }
 
   public String getGraph_base() {
@@ -26,6 +28,6 @@ public String getGraph_base() {
   }
 
   public void setGraph_base(String graph_base) {
-    this.graph_base = graph_base;
+    this.graph_base =  ObaUtils.check_trailing_slash(graph_base);
   }
 }
diff --git a/src/main/java/edu/isi/oba/config/YamlConfig.java b/src/main/java/edu/isi/oba/config/YamlConfig.java
index e259b17..4573950 100644
--- a/src/main/java/edu/isi/oba/config/YamlConfig.java
+++ b/src/main/java/edu/isi/oba/config/YamlConfig.java
@@ -20,7 +20,7 @@ public class YamlConfig {
   public Boolean enable_put_paths = false;
   public Boolean enable_delete_paths = false;
   public List<String> ontologies;
-  public EndpointConfig endpoint;
+  private EndpointConfig endpoint;
 
   public AuthConfig auth;
   public FirebaseConfig firebase;