Refactored code so that common property fallback resolution is in it's own utility class.

Author: ivanmrsulja

api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/base/SearchEngineUtil.java

@@ -0,0 +1,30 @@
+package edu.cornell.mannlib.vitro.webapp.searchengine.base;
+
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class SearchEngineUtil {
+
+    private static final Log log = LogFactory.getLog(SearchEngineUtil.class);
+
+    public static String getSearchEngineURLProperty() {
+        ConfigurationProperties config = ConfigurationProperties.getInstance();
+        if (config.getProperty("vitro.local.searchengine.url", "").isEmpty()) {
+            return tryFetchLegacySolrConfiguration(config);
+        }
+
+        return config.getProperty("vitro.local.searchengine.url", "");
+    }
+
+    private static String tryFetchLegacySolrConfiguration(ConfigurationProperties config) {
+        String legacyConfigValue = config.getProperty("vitro.local.solr.url", "");
+        if (!legacyConfigValue.isEmpty()) {
+            log.warn(
+                "vitro.local.solr.url is deprecated, switch to using" +
+                    " vitro.local.searchengine.url as soon as possible.");
+        }
+
+        return legacyConfigValue;
+    }
+}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/solr/SolrSearchEngine.java

@@ -10,6 +10,7 @@
 
 import javax.servlet.ServletContext;
 
+import edu.cornell.mannlib.vitro.webapp.searchengine.base.SearchEngineUtil;
 import edu.cornell.mannlib.vitro.webapp.servlet.setup.SearchEngineSmokeTest;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.StandardHttpRequestRetryHandler;
@@ -44,7 +45,7 @@ public class SolrSearchEngine implements SearchEngine {
 	@Override
 	public void startup(Application application, ComponentStartupStatus css) {
 		ServletContext ctx = application.getServletContext();
-		String solrServerUrlString = SearchEngineSmokeTest.getSearchEngineURLProperty();
+		String solrServerUrlString = SearchEngineUtil.getSearchEngineURLProperty();
 		if (solrServerUrlString == null) {
 			css.fatal("Could not find vitro.local.searchengine.url in "
 					+ "runtime.properties.  Vitro application needs the URL of "

api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SearchEngineSmokeTest.java

@@ -10,7 +10,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.searchengine.base.SearchEngineUtil;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 import edu.cornell.mannlib.vitro.webapp.utils.http.ESHttpsBasicClientFactory;
 import org.apache.commons.logging.Log;
@@ -77,30 +77,11 @@ private static String getBaseServiceUrl(String url) {
         return url;
     }
 
-    public static String getSearchEngineURLProperty() {
-        ConfigurationProperties config = ConfigurationProperties.getInstance();
-        if (config.getProperty("vitro.local.searchengine.url", "").isEmpty()) {
-            return tryFetchLegacySolrConfiguration(config);
-        }
-
-        return config.getProperty("vitro.local.searchengine.url", "");
-    }
-
-    private static String tryFetchLegacySolrConfiguration(ConfigurationProperties config) {
-        String legacyConfigValue = config.getProperty("vitro.local.solr.url", "");
-        if (!legacyConfigValue.isEmpty()) {
-            log.warn(
-                "vitro.local.solr.url is deprecated, switch to using vitro.local.searchengine.url as soon as possible.");
-        }
-
-        return legacyConfigValue;
-    }
-
     @Override
     public void contextInitialized(ServletContextEvent sce) {
         final StartupStatus ss = StartupStatus.getBean(sce.getServletContext());
 
-        String searchEngineUrlString = getSearchEngineURLProperty();
+        String searchEngineUrlString = SearchEngineUtil.getSearchEngineURLProperty();
 
         if (searchEngineUrlString.isEmpty()) {
             ss.fatal(this, "No search engine is configured");

api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SolrSmokeTest.java

@@ -11,6 +11,7 @@
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
+import edu.cornell.mannlib.vitro.webapp.searchengine.base.SearchEngineUtil;
 import edu.cornell.mannlib.vitro.webapp.utils.http.HttpClientFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -51,7 +52,7 @@ public SolrSmokeTest(ServletContextListener listener) {
 	public void doTest(ServletContextEvent sce) {
 		final StartupStatus ss = StartupStatus.getBean(sce.getServletContext());
 
-		String solrUrlString = SearchEngineSmokeTest.getSearchEngineURLProperty();
+		String solrUrlString = SearchEngineUtil.getSearchEngineURLProperty();
 		if (solrUrlString.isEmpty()) {
 			ss.fatal(listener, "Can't connect to Solr search engine. "
 					+ "runtime.properties must contain a value for "