You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2015/08/10 23:11:38 UTC

svn commit: r1695168 - in /lucene/dev/branches/lucene_solr_5_3: ./ bin/ solr/ solr/solrj/ solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java solr/solrj/src/java/org/apache/solr/common/util/Pair.java

Author: markrmiller
Date: Mon Aug 10 21:11:38 2015
New Revision: 1695168

URL: http://svn.apache.org/r1695168
Log:
SOLR-7757: Take random public static Pair class out of ZkStateReader and move it to a Util location.

Added:
    lucene/dev/branches/lucene_solr_5_3/bin/
    lucene/dev/branches/lucene_solr_5_3/solr/solrj/src/java/org/apache/solr/common/util/Pair.java
      - copied unchanged from r1695084, lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/util/Pair.java
Modified:
    lucene/dev/branches/lucene_solr_5_3/   (props changed)
    lucene/dev/branches/lucene_solr_5_3/solr/   (props changed)
    lucene/dev/branches/lucene_solr_5_3/solr/solrj/   (props changed)
    lucene/dev/branches/lucene_solr_5_3/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java

Modified: lucene/dev/branches/lucene_solr_5_3/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java?rev=1695168&r1=1695167&r2=1695168&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java Mon Aug 10 21:11:38 2015
@@ -36,6 +36,7 @@ import java.util.concurrent.TimeUnit;
 import org.apache.solr.common.Callable;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
+import org.apache.solr.common.util.Pair;
 import org.apache.solr.common.util.Utils;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
@@ -437,27 +438,6 @@ public class ZkStateReader implements Cl
     }
   }
 
-  //todo remove when we move to java 8
-  static public class Pair<K, V> implements Serializable {
-    private K key;
-
-    public K getKey() {
-      return key;
-    }
-
-    private V value;
-
-    public V getValue() {
-      return value;
-    }
-
-    public Pair(K key, V value) {
-      this.key = key;
-      this.value = value;
-    }
-  }
-
-
   private void addSecuritynodeWatcher(final String path, final Callable<Pair<byte[], Stat>> callback)
       throws KeeperException, InterruptedException {
     zkClient.exists(SOLR_SECURITY_CONF_PATH,