You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/02/22 14:38:41 UTC

lucene-solr:master: SOLR-10173: Make HttpShardHandlerFactory.getReplicaListTransformer more extensible. (Ramsey Haddad via Christine Poerschke)

Repository: lucene-solr
Updated Branches:
  refs/heads/master 365a7ac0d -> ee55bec9f


SOLR-10173: Make HttpShardHandlerFactory.getReplicaListTransformer more extensible. (Ramsey Haddad via Christine Poerschke)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ee55bec9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ee55bec9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ee55bec9

Branch: refs/heads/master
Commit: ee55bec9f0dc44661e77b6c65b05d1ab586a4cdc
Parents: 365a7ac
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Feb 22 11:19:56 2017 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Feb 22 14:15:40 2017 +0000

----------------------------------------------------------------------
 solr/CHANGES.txt                                                 | 3 +++
 .../apache/solr/handler/component/HttpShardHandlerFactory.java   | 4 ++--
 .../apache/solr/handler/component/ReplicaListTransformer.java    | 2 +-
 .../solr/handler/component/ReplicaListTransformerTest.java       | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ee55bec9/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c358088..20666fd 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -226,6 +226,9 @@ Other Changes
 
 * SOLR-9966: Convert/migrate tests using EasyMock to Mockito (Cao Manh Dat,  Uwe Schindler)
 
+* SOLR-10173: Make HttpShardHandlerFactory.getReplicaListTransformer more extensible.
+  (Ramsey Haddad via Christine Poerschke)
+
 ==================  6.4.2 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ee55bec9/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
index 87d5c3d..83a2d60 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
@@ -103,7 +103,7 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.
 
   private HttpClientMetricNameStrategy metricNameStrategy;
 
-  private final Random r = new Random();
+  protected final Random r = new Random();
 
   private final ReplicaListTransformer shufflingReplicaListTransformer = new ShufflingReplicaListTransformer(r);
 
@@ -318,7 +318,7 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.
       return s != null && s.startsWith(preferredHostAddress);
     }
   }
-  ReplicaListTransformer getReplicaListTransformer(final SolrQueryRequest req)
+  protected ReplicaListTransformer getReplicaListTransformer(final SolrQueryRequest req)
   {
     final SolrParams params = req.getParams();
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ee55bec9/solr/core/src/java/org/apache/solr/handler/component/ReplicaListTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/ReplicaListTransformer.java b/solr/core/src/java/org/apache/solr/handler/component/ReplicaListTransformer.java
index bf30fa6..b7784e8 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ReplicaListTransformer.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ReplicaListTransformer.java
@@ -21,7 +21,7 @@ import java.util.List;
 import org.apache.solr.common.cloud.Replica;
 import org.apache.solr.common.params.ShardParams;
 
-interface ReplicaListTransformer {
+public interface ReplicaListTransformer {
 
   /**
    * Transforms the passed in list of choices. Transformations can include (but are not limited to)

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ee55bec9/solr/core/src/test/org/apache/solr/handler/component/ReplicaListTransformerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/ReplicaListTransformerTest.java b/solr/core/src/test/org/apache/solr/handler/component/ReplicaListTransformerTest.java
index 96d2319..8159971 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/ReplicaListTransformerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/ReplicaListTransformerTest.java
@@ -94,7 +94,7 @@ public class ReplicaListTransformerTest extends LuceneTestCase {
       transformer = new HttpShardHandlerFactory() {
 
         @Override
-        ReplicaListTransformer getReplicaListTransformer(final SolrQueryRequest req)
+        protected ReplicaListTransformer getReplicaListTransformer(final SolrQueryRequest req)
         {
           final SolrParams params = req.getParams();