Url Management Refactor

conf/backendURLs.json

@@ -1,9 +1,9 @@
 [
-  [
-    "http://yodaqa.felk.cvut.cz/fuseki-dbp/dbpedia/query",
-    "http://yodaqa.felk.cvut.cz/fuseki-fb/freebase/query",
-    "http://yodaqa.felk.cvut.cz/dbp-labels1",
-    "http://yodaqa.felk.cvut.cz/dbp-labels2",
-    "http://yodaqa.felk.cvut.cz/apache/solr/"
-  ]
-]
+  {
+    "cz.brmlab.yodaqa.dbpediaurl": "http://yodaqa.felk.cvut.cz/fuseki-dbp/dbpedia/query",
+    "cz.brmlab.yodaqa.freebaseurl": "http://yodaqa.felk.cvut.cz/fuseki-fb/freebase/query",
+    "cz.brmlab.yodaqa.dbpedialabelurl": "http://yodaqa.felk.cvut.cz/dbp-labels1",
+    "cz.brmlab.yodaqa.dictionarylabelurl": "http://yodaqa.felk.cvut.cz/dbp-labels2",
+    "cz.brmlab.yodaqa.solrurl": "http://yodaqa.felk.cvut.cz/apache/solr/"
+  }
+]

src/main/java/cz/brmlab/yodaqa/io/web/WebInterface.java

@@ -11,14 +11,12 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Random;
 
-import cz.brmlab.yodaqa.provider.UrlManager;
+import cz.brmlab.yodaqa.provider.url.UrlManager;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import spark.QueryParamsMap;
 import spark.Request;
 import spark.Response;
 import spark.Route;
@@ -142,7 +140,7 @@ public Object handle(Request request, Response response) {
 			public Object handle(Request request, Response response) {
 				response.type("application/json");
 				response.header("Access-Control-Allow-Origin", "*");
-				return UrlManager.printState();
+				return UrlManager.getInstance().printState();
 
 			}
 		});

src/main/java/cz/brmlab/yodaqa/pipeline/YodaQA.java

@@ -1,6 +1,7 @@
 package cz.brmlab.yodaqa.pipeline;
 
-import cz.brmlab.yodaqa.provider.UrlManager;
+import cz.brmlab.yodaqa.provider.url.UrlConstants;
+import cz.brmlab.yodaqa.provider.url.UrlManager;
 import org.apache.uima.analysis_engine.AnalysisEngineDescription;
 import org.apache.uima.cas.CAS;
 import org.apache.uima.fit.factory.AggregateBuilder;
@@ -20,7 +21,6 @@
 import cz.brmlab.yodaqa.pipeline.structured.DBpediaOntologyAnswerProducer;
 import cz.brmlab.yodaqa.pipeline.structured.DBpediaPropertyAnswerProducer;
 import cz.brmlab.yodaqa.pipeline.structured.FreebaseOntologyAnswerProducer;
-import cz.brmlab.yodaqa.pipeline.AnswerHitlistSerialize;
 import cz.brmlab.yodaqa.provider.IPv6Check;
 import cz.brmlab.yodaqa.provider.solr.SolrNamedSource;
 
@@ -56,7 +56,7 @@ public class YodaQA /* XXX: extends AggregateBuilder ? */ {
 
 			//SolrNamedSource.register("guten", "data/guten", null);
 			//SolrNamedSource.register("enwiki", "collection1", "http://127.0.0.1:8983/solr/");
-			SolrNamedSource.register("enwiki", "collection1", UrlManager.lookUpUrl(UrlManager.DataBackends.SOLR.ordinal()));
+			SolrNamedSource.register("enwiki", "collection1", UrlManager.getInstance().getUrl(UrlConstants.SOLR));
 		} catch (Exception e) {
 			e.printStackTrace();
 			System.err.println("*** Exception caught during SolrNamedSource initialization. ***");

src/main/java/cz/brmlab/yodaqa/provider/rdf/DBpediaLookup.java

@@ -1,14 +1,15 @@
 package cz.brmlab.yodaqa.provider.rdf;
 
-import cz.brmlab.yodaqa.provider.UrlManager;
+import cz.brmlab.yodaqa.provider.url.UrlConstants;
+import cz.brmlab.yodaqa.provider.url.UrlManager;
 
 /** This is an abstract base class for accessing DBpedia. */
 
 public abstract class DBpediaLookup extends CachedJenaLookup {
 	public DBpediaLookup() {
 		/* Replace the first URL below with http://dbpedia.org/sparql
 		 * to use the public DBpedia SPARQL endpoint. */
-		super(UrlManager.lookUpUrl(UrlManager.DataBackends.DBPEDIA.ordinal()),
+		super(UrlManager.getInstance().getUrl(UrlConstants.DBPEDIA),
 			"PREFIX : <http://dbpedia.org/resource/>\n" +
 			"PREFIX dbpedia2: <http://dbpedia.org/property/>\n" +
 			"PREFIX dbpedia: <http://dbpedia.org/>\n" +

src/main/java/cz/brmlab/yodaqa/provider/rdf/DBpediaTitles.java

@@ -18,7 +18,8 @@
 import com.google.gson.Gson;
 import com.hp.hpl.jena.rdf.model.Literal;
 
-import cz.brmlab.yodaqa.provider.UrlManager;
+import cz.brmlab.yodaqa.provider.url.UrlConstants;
+import cz.brmlab.yodaqa.provider.url.UrlManager;
 import org.slf4j.Logger;
 
 /** A wrapper around DBpedia "Titles" dataset that maps titles to
@@ -31,8 +32,8 @@
  * and disambiguation pages. */
 
 public class DBpediaTitles extends DBpediaLookup {
-	protected static final String fuzzyLookupUrl = UrlManager.lookUpUrl(UrlManager.DataBackends.LABEL1.ordinal());
-	protected static final String crossWikiLookupUrl = UrlManager.lookUpUrl(UrlManager.DataBackends.LABEL2.ordinal());
+	protected static final String fuzzyLookupUrl = UrlManager.getInstance().getUrl(UrlConstants.DBPEDIA_LABEL);
+	protected static final String crossWikiLookupUrl = UrlManager.getInstance().getUrl(UrlConstants.DICTIONARY_LABEL);
 
 	/** A container of enwiki article metadata.
 	 * This must 1:1 map to label-lookup API. */

src/main/java/cz/brmlab/yodaqa/provider/rdf/FreebaseLookup.java

@@ -1,12 +1,13 @@
 package cz.brmlab.yodaqa.provider.rdf;
 
-import cz.brmlab.yodaqa.provider.UrlManager;
+import cz.brmlab.yodaqa.provider.url.UrlConstants;
+import cz.brmlab.yodaqa.provider.url.UrlManager;
 
 /** This is an abstract base class for accessing Freebase. */
 
 public abstract class FreebaseLookup extends CachedJenaLookup {
 	public FreebaseLookup() {
-		super(UrlManager.lookUpUrl(UrlManager.DataBackends.FREEBASE.ordinal()),
+		super(UrlManager.getInstance().getUrl(UrlConstants.FREEBASE),
 			"PREFIX ns: <http://rdf.freebase.com/ns/>\n" +
 			"");
 	}

src/main/java/cz/brmlab/yodaqa/provider/url/BackendUrlGroup.java

@@ -0,0 +1,12 @@
+package cz.brmlab.yodaqa.provider.url;
+
+import java.util.HashMap;
+
+/**
+ * Created by bzhao on 12/21/16.
+ */
+public class BackendUrlGroup extends HashMap<String,String> {
+    public String getUrl(String urlkey) {
+        return this.get(urlkey);
+    }
+}

src/main/java/cz/brmlab/yodaqa/provider/url/UrlConstants.java

@@ -0,0 +1,16 @@
+package cz.brmlab.yodaqa.provider.url;
+
+/**
+ * Created by bzhao on 12/23/16.
+ * URL related constants, these are used as:
+ *  - keys in the json dict map of backendUrls.conf
+ *  - system property overrides from CLI,
+ *  eg: -Dcz.brmlab.yodaqa.dbpediaurl=http://yodaqa.felk.cvut.cz/fuseki-dbp/dbpedia/query
+ */
+public class UrlConstants {
+    public final static String DBPEDIA = "cz.brmlab.yodaqa.dbpediaurl";
+    public final static String FREEBASE = "cz.brmlab.yodaqa.freebaseurl";
+    public final static String DBPEDIA_LABEL = "cz.brmlab.yodaqa.dbpedialabelurl";
+    public final static String DICTIONARY_LABEL = "cz.brmlab.yodaqa.dictionarylabelurl";
+    public final static String SOLR = "cz.brmlab.yodaqa.solrurl";
+}