Simplify creation of RestrictedSolrClient

src/main/java/dk/kb/netarchivesuite/solrwayback/solr/NetarchiveSolrClient.java

@@ -74,20 +74,20 @@ protected NetarchiveSolrClient() { // private. Singleton
      *
      */
     public static void initialize(String solrServerUrl) {
-        SolrClient innerSolrClient = new HttpSolrClient.Builder(solrServerUrl).build();
+        SolrClient innerSolrClient = RestrictedSolrClient.createSolrClient();
 
         if (PropertiesLoader.SOLR_SERVER_CACHING) {
             int maxCachingEntries = PropertiesLoader.SOLR_SERVER_CACHING_MAX_ENTRIES;
             int maxCachingSeconds = PropertiesLoader.SOLR_SERVER_CACHING_AGE_SECONDS;
             solrServer = new CachingSolrClient(innerSolrClient, maxCachingEntries,  maxCachingSeconds, -1); //-1 means no maximum number of connections 
             log.info("SolrClient initialized with caching properties: maxCachedEntrie="+maxCachingEntries +" cacheAgeSeconds="+maxCachingSeconds);
         } else {
-            solrServer = new HttpSolrClient.Builder(solrServerUrl).build();
-            log.info("SolClient initialized without caching");
+            solrServer = innerSolrClient;
+            log.info("SolrClient initialized without caching");
         }
 
         // some of the solr query will never using cache. word cloud(cache memory) + playback resolving etc. (cache poisoning)
-        noCacheSolrServer = new HttpSolrClient.Builder(solrServerUrl).build();
+        noCacheSolrServer = innerSolrClient;
 
         // solrServer.setRequestWriter(new BinaryRequestWriter()); // To avoid http
         // error code 413/414, due to monster URI. (and it is faster)

src/main/java/dk/kb/netarchivesuite/solrwayback/solr/RestrictedSolrClient.java

@@ -38,7 +38,10 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * SolrClient wrapper that ensures that {@link PropertiesLoader#SOLR_PARAMS_MAP}
@@ -67,6 +70,26 @@ public class RestrictedSolrClient extends SolrClient {
      */
     private final Map<String, String> fixedParams;
 
+    /**
+     * Create a {@link HttpSolrClient} wrapped as a {@code RestrictedSolrClient} using the property
+     * {@link PropertiesLoader#SOLR_PARAMS_MAP} for restrictions and the given {@code collection} as
+     * {@link #defaultCollection}.
+     * <p>
+     * The {@code solrBaseURL} and {@code collection} are parsed from the combined version
+     * {@link PropertiesLoader#SOLR_SERVER}.
+     * @return a {@code SolrClient} where all calls are restricted aka "safe".
+     */
+    public static RestrictedSolrClient createSolrClient() {
+        Matcher m = SOLR_COLLECTION_PATTERN.matcher(PropertiesLoader.SOLR_SERVER);
+        if (!m.matches()) {
+            throw new IllegalStateException(String.format(
+                    Locale.ROOT, "Unable to match Solr and collection from '%s' using pattern '%s'",
+                    PropertiesLoader.SOLR_SERVER, SOLR_COLLECTION_PATTERN.pattern()));
+        }
+        return createSolrClient(m.group(1), m.group(2));
+    }
+    private static final Pattern SOLR_COLLECTION_PATTERN = Pattern.compile("(http.*)/([^/]+)/?$");
+
     /**
      * Create a {@link HttpSolrClient} wrapped as a {@code RestrictedSolrClient} using the property
      * {@link PropertiesLoader#SOLR_PARAMS_MAP} for restrictions and the given {@code collection} as
@@ -76,6 +99,7 @@ public class RestrictedSolrClient extends SolrClient {
      * @return a {@code SolrClient} where all calls are restricted aka "safe".
      */
     public static RestrictedSolrClient createSolrClient(String solrBaseURL, String collection) {
+        log.info("Creating RestrictedSolrClient(solrBaseURL='{}', collection='{}')", solrBaseURL, collection);
         return new RestrictedSolrClient(new HttpSolrClient.Builder(solrBaseURL).build(), collection);
     }