You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/07/14 15:55:48 UTC
svn commit: r1690935 [2/2] - in /lucene/dev/trunk/solr:
core/src/java/org/apache/solr/cloud/
core/src/java/org/apache/solr/cloud/overseer/
core/src/java/org/apache/solr/cloud/rule/
core/src/java/org/apache/solr/core/ core/src/java/org/apache/solr/handl...
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionProcessorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionProcessorTest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionProcessorTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionProcessorTest.java Tue Jul 14 13:55:46 2015
@@ -31,6 +31,7 @@ import org.apache.solr.common.params.Cor
import org.apache.solr.common.params.CoreAdminParams.CoreAdminAction;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.StrUtils;
+import org.apache.solr.common.util.Utils;
import org.apache.solr.handler.component.ShardHandler;
import org.apache.solr.handler.component.ShardHandlerFactory;
import org.apache.solr.handler.component.ShardRequest;
@@ -401,7 +402,7 @@ public class OverseerCollectionProcessor
protected void issueCreateJob(Integer numberOfSlices,
Integer replicationFactor, Integer maxShardsPerNode, List<String> createNodeList, boolean sendCreateNodeList, boolean createNodeSetShuffle) {
- Map<String,Object> propMap = ZkNodeProps.makeMap(
+ Map<String,Object> propMap = Utils.makeMap(
Overseer.QUEUE_OPERATION, CollectionParams.CollectionAction.CREATE.toLower(),
ZkStateReader.REPLICATION_FACTOR, replicationFactor.toString(),
"name", COLLECTION_NAME,
@@ -418,7 +419,7 @@ public class OverseerCollectionProcessor
}
ZkNodeProps props = new ZkNodeProps(propMap);
- QueueEvent qe = new QueueEvent("id", ZkStateReader.toJSON(props), null){
+ QueueEvent qe = new QueueEvent("id", Utils.toJSON(props), null){
@Override
public void setBytes(byte[] bytes) {
lastProcessMessageResult = SolrResponse.deserialize( bytes);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java Tue Jul 14 13:55:46 2015
@@ -27,12 +27,11 @@ import org.apache.solr.client.solrj.requ
import org.apache.solr.cloud.overseer.OverseerAction;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkNodeProps;
-import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CollectionParams.CollectionAction;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.common.util.Utils;
import org.apache.zookeeper.data.Stat;
-import org.junit.BeforeClass;
import org.junit.Test;
import java.io.IOException;
@@ -45,7 +44,7 @@ import java.util.Map;
import static org.apache.solr.cloud.OverseerCollectionProcessor.NUM_SLICES;
import static org.apache.solr.cloud.OverseerCollectionProcessor.getLeaderNode;
import static org.apache.solr.cloud.OverseerCollectionProcessor.getSortedOverseerNodeNames;
-import static org.apache.solr.common.cloud.ZkNodeProps.makeMap;
+import static org.apache.solr.common.util.Utils.makeMap;
import static org.apache.solr.common.cloud.ZkStateReader.MAX_SHARDS_PER_NODE;
import static org.apache.solr.common.cloud.ZkStateReader.REPLICATION_FACTOR;
@@ -80,10 +79,10 @@ public class OverseerRolesTest extends
SolrZkClient zk = client.getZkStateReader().getZkClient();
byte[] data = new byte[0];
data = zk.getData("/overseer_elect/leader", null, new Stat(), true);
- Map m = (Map) ZkStateReader.fromJSON(data);
+ Map m = (Map) Utils.fromJSON(data);
String s = (String) m.get("id");
String leader = LeaderElector.getNodeName(s);
- Overseer.getInQueue(zk).offer(ZkStateReader.toJSON(new ZkNodeProps(Overseer.QUEUE_OPERATION, OverseerAction.QUIT.toLower())));
+ Overseer.getInQueue(zk).offer(Utils.toJSON(new ZkNodeProps(Overseer.QUEUE_OPERATION, OverseerAction.QUIT.toLower())));
long timeout = System.currentTimeMillis()+10000;
String newLeader=null;
for(;System.currentTimeMillis() < timeout;){
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Tue Jul 14 13:55:46 2015
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
@@ -46,6 +45,7 @@ import org.apache.solr.common.cloud.ZkNo
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CollectionParams;
import org.apache.solr.common.util.ExecutorUtil;
+import org.apache.solr.common.util.Utils;
import org.apache.solr.core.CloudConfig;
import org.apache.solr.handler.component.HttpShardHandlerFactory;
import org.apache.solr.update.UpdateShardHandler;
@@ -131,7 +131,7 @@ public class OverseerTest extends SolrTe
ZkStateReader.CORE_NODE_NAME_PROP, coreNodeName,
ZkStateReader.COLLECTION_PROP, collection);
DistributedQueue q = Overseer.getInQueue(zkClient);
- q.offer(ZkStateReader.toJSON(m));
+ q.offer(Utils.toJSON(m));
return null;
} else {
ZkNodeProps m = new ZkNodeProps(Overseer.QUEUE_OPERATION, OverseerAction.STATE.toLower(),
@@ -143,7 +143,7 @@ public class OverseerTest extends SolrTe
ZkStateReader.NUM_SHARDS_PROP, Integer.toString(numShards),
ZkStateReader.BASE_URL_PROP, "http://" + nodeName + "/solr/");
DistributedQueue q = Overseer.getInQueue(zkClient);
- q.offer(ZkStateReader.toJSON(m));
+ q.offer(Utils.toJSON(m));
}
if (collection.length() > 0) {
@@ -555,7 +555,7 @@ public class OverseerTest extends SolrTe
ZkStateReader.ROLES_PROP, "",
ZkStateReader.STATE_PROP, Replica.State.RECOVERING.toString());
- q.offer(ZkStateReader.toJSON(m));
+ q.offer(Utils.toJSON(m));
waitForCollections(reader, "collection1");
@@ -571,7 +571,7 @@ public class OverseerTest extends SolrTe
ZkStateReader.ROLES_PROP, "",
ZkStateReader.STATE_PROP, Replica.State.ACTIVE.toString());
- q.offer(ZkStateReader.toJSON(m));
+ q.offer(Utils.toJSON(m));
verifyStatus(reader, Replica.State.ACTIVE);
@@ -995,7 +995,7 @@ public class OverseerTest extends SolrTe
ZkStateReader.MAX_SHARDS_PER_NODE, "1"
);
DistributedQueue q = Overseer.getInQueue(controllerClient);
- q.offer(ZkStateReader.toJSON(m));
+ q.offer(Utils.toJSON(m));
controllerClient.makePath("/collections/perf" + i, true);
}
@@ -1010,7 +1010,7 @@ public class OverseerTest extends SolrTe
ZkStateReader.BASE_URL_PROP, "http://" + "node1"
+ "/solr/");
DistributedQueue q = Overseer.getInQueue(controllerClient);
- q.offer(ZkStateReader.toJSON(m));
+ q.offer(Utils.toJSON(m));
if (j >= MAX_COLLECTIONS - 1) j = 0;
if (k >= MAX_CORES - 1) k = 0;
if (i > 0 && i % 100 == 0) log.info("Published {} items", i);
@@ -1027,7 +1027,7 @@ public class OverseerTest extends SolrTe
ZkStateReader.BASE_URL_PROP, "http://" + "node1"
+ "/solr/");
DistributedQueue q = Overseer.getInQueue(controllerClient);
- q.offer(ZkStateReader.toJSON(m));
+ q.offer(Utils.toJSON(m));
Timer t = new Timer();
TimerContext context = t.time();
@@ -1123,7 +1123,7 @@ public class OverseerTest extends SolrTe
ZkStateReader.CORE_NAME_PROP, "core1",
ZkStateReader.ROLES_PROP, "",
ZkStateReader.STATE_PROP, Replica.State.RECOVERING.toString());
- queue.offer(ZkStateReader.toJSON(m));
+ queue.offer(Utils.toJSON(m));
m = new ZkNodeProps(Overseer.QUEUE_OPERATION, "state",
ZkStateReader.BASE_URL_PROP, "http://127.0.0.1/solr",
ZkStateReader.NODE_NAME_PROP, "node1",
@@ -1132,7 +1132,7 @@ public class OverseerTest extends SolrTe
ZkStateReader.CORE_NAME_PROP, "core2",
ZkStateReader.ROLES_PROP, "",
ZkStateReader.STATE_PROP, Replica.State.RECOVERING.toString());
- queue.offer(ZkStateReader.toJSON(m));
+ queue.offer(Utils.toJSON(m));
overseerClient = electNewOverseer(server.getZkAddress());
@@ -1146,7 +1146,7 @@ public class OverseerTest extends SolrTe
ZkStateReader.CORE_NAME_PROP, "core3",
ZkStateReader.ROLES_PROP, "",
ZkStateReader.STATE_PROP, Replica.State.RECOVERING.toString());
- queue.offer(ZkStateReader.toJSON(m));
+ queue.offer(Utils.toJSON(m));
for(int i=0;i<100;i++) {
Slice s = reader.getClusterState().getSlice("collection1", "s1");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java Tue Jul 14 13:55:46 2015
@@ -43,7 +43,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Properties;
-import static org.apache.solr.common.cloud.ZkNodeProps.makeMap;
+import static org.apache.solr.common.util.Utils.makeMap;
/**
* We want to make sure that when migrating between http and https modes the
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java Tue Jul 14 13:55:46 2015
@@ -35,10 +35,10 @@ import org.apache.solr.common.cloud.Hash
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
-import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CollectionParams;
import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.util.Utils;
import org.junit.Test;
import java.io.IOException;
@@ -227,7 +227,7 @@ public class ShardSplitTest extends Basi
HashMap<String, List<Integer>> collectionInfos = new HashMap<>();
String shard_fld = "shard_s";
try (CloudSolrClient client = createCloudClient(null)) {
- Map<String, Object> props = ZkNodeProps.makeMap(
+ Map<String, Object> props = Utils.makeMap(
REPLICATION_FACTOR, replicationFactor,
MAX_SHARDS_PER_NODE, maxShardsPerNode,
NUM_SLICES, numShards,
@@ -302,7 +302,7 @@ public class ShardSplitTest extends Basi
HashMap<String, List<Integer>> collectionInfos = new HashMap<>();
try (CloudSolrClient client = createCloudClient(null)) {
- Map<String, Object> props = ZkNodeProps.makeMap(
+ Map<String, Object> props = Utils.makeMap(
REPLICATION_FACTOR, replicationFactor,
MAX_SHARDS_PER_NODE, maxShardsPerNode,
NUM_SLICES, numShards);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java Tue Jul 14 13:55:46 2015
@@ -17,7 +17,7 @@ package org.apache.solr.cloud;
* limitations under the License.
*/
-import static org.apache.solr.common.cloud.ZkNodeProps.makeMap;
+import static org.apache.solr.common.util.Utils.makeMap;
import java.util.Collection;
import java.util.HashSet;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverUtilsTest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverUtilsTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverUtilsTest.java Tue Jul 14 13:55:46 2015
@@ -36,6 +36,7 @@ import org.apache.solr.common.cloud.DocC
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.util.Utils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -356,7 +357,7 @@ public class SharedFSAutoReplicaFailover
String json;
try {
- json = new String(ZkStateReader.toJSON(clusterState), "UTF-8");
+ json = new String(Utils.toJSON(clusterState), "UTF-8");
} catch (UnsupportedEncodingException e) {
throw new RuntimeException("Unexpected");
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SliceStateTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SliceStateTest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SliceStateTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SliceStateTest.java Tue Jul 14 13:55:46 2015
@@ -23,7 +23,7 @@ import org.apache.solr.common.cloud.DocC
import org.apache.solr.common.cloud.DocRouter;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
-import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.util.Utils;
import org.junit.Test;
import java.util.HashMap;
@@ -51,7 +51,7 @@ public class SliceStateTest extends Solr
collectionStates.put("collection1", new DocCollection("collection1", slices, null, DocRouter.DEFAULT));
ClusterState clusterState = new ClusterState(-1,liveNodes, collectionStates);
- byte[] bytes = ZkStateReader.toJSON(clusterState);
+ byte[] bytes = Utils.toJSON(clusterState);
ClusterState loadedClusterState = ClusterState.load(-1, bytes, liveNodes);
assertSame("Default state not set to active", Slice.State.ACTIVE, loadedClusterState.getSlice("collection1", "shard1").getState());
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java Tue Jul 14 13:55:46 2015
@@ -28,7 +28,7 @@ import java.util.Map;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.core.ConfigOverlay;
+import org.apache.solr.common.util.Utils;
import org.apache.solr.core.MemClassLoader;
import org.apache.solr.core.TestDynamicLoading;
import org.apache.solr.core.TestSolrConfigHandler;
@@ -37,7 +37,6 @@ import org.apache.solr.util.CryptoKeys;
import org.apache.solr.util.RESTfulServerProvider;
import org.apache.solr.util.RestTestHarness;
import org.apache.zookeeper.CreateMode;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -158,7 +157,7 @@ public class TestCryptoKeys extends Abst
1l, 10);
Map map = TestSolrConfigHandler.getRespMap("/runtime?wt=json", client);
- String s = (String) ConfigOverlay.getObjectByPath(map, false, Arrays.asList("error", "msg"));
+ String s = (String) Utils.getObjectByPath(map, false, Arrays.asList("error", "msg"));
assertNotNull(TestBlobHandler.getAsString(map), s);
assertTrue(TestBlobHandler.getAsString(map), s.contains("should be signed with one of the keys in ZK /keys/exe"));
@@ -177,7 +176,7 @@ public class TestCryptoKeys extends Abst
wrongSig, 10);
map = TestSolrConfigHandler.getRespMap("/runtime?wt=json", client);
- s = (String) ConfigOverlay.getObjectByPath(map, false, Arrays.asList("error", "msg"));
+ s = (String) Utils.getObjectByPath(map, false, Arrays.asList("error", "msg"));
assertNotNull(TestBlobHandler.getAsString(map), s);//No key matched signature for jar
assertTrue(TestBlobHandler.getAsString(map), s.contains("No key matched signature for jar"));
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java Tue Jul 14 13:55:46 2015
@@ -22,10 +22,10 @@ import org.apache.solr.client.solrj.impl
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
-import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CollectionParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.Utils;
import org.apache.zookeeper.KeeperException;
import org.junit.Test;
@@ -221,7 +221,7 @@ public class TestRebalanceLeaders extend
if (data == null) {
return false;
} else {
- Map m = (Map) ZkStateReader.fromJSON(data);
+ Map m = (Map) Utils.fromJSON(data);
zkCore = (String) m.get("core");
repCore = ent.getValue().getStr("core");
if (zkCore.equals(repCore) == false) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java Tue Jul 14 13:55:46 2015
@@ -29,6 +29,7 @@ import org.apache.solr.common.cloud.ZkCo
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.util.Utils;
import org.apache.solr.core.CloudConfig;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
@@ -141,7 +142,7 @@ public class ZkControllerTest extends So
//Verify the URL Scheme is taken into account
zkStateReader.getZkClient().create(ZkStateReader.CLUSTER_PROPS,
- ZkStateReader.toJSON(Collections.singletonMap("urlScheme", "https")), CreateMode.PERSISTENT, true);
+ Utils.toJSON(Collections.singletonMap("urlScheme", "https")), CreateMode.PERSISTENT, true);
assertEquals("https://zzz.xxx:1234/solr",
zkStateReader.getBaseUrlForNodeName("zzz.xxx:1234_solr"));
@@ -178,7 +179,7 @@ public class ZkControllerTest extends So
props.put("configName", actualConfigName);
ZkNodeProps zkProps = new ZkNodeProps(props);
zkClient.makePath(ZkStateReader.COLLECTIONS_ZKNODE + "/"
- + COLLECTION_NAME, ZkStateReader.toJSON(zkProps),
+ + COLLECTION_NAME, Utils.toJSON(zkProps),
CreateMode.PERSISTENT, true);
if (DEBUG) {
@@ -351,7 +352,7 @@ public class ZkControllerTest extends So
Slice slice = new Slice("shard1", replicas, sliceProps);
DocCollection c = new DocCollection("testPublishAndWaitForDownStates", map("shard1", slice), Collections.emptyMap(), DocRouter.DEFAULT);
ClusterState state = new ClusterState(0, Collections.emptySet(), map("testPublishAndWaitForDownStates", c));
- byte[] bytes = ZkStateReader.toJSON(state);
+ byte[] bytes = Utils.toJSON(state);
zkController.getZkClient().makePath(ZkStateReader.getCollectionPath("testPublishAndWaitForDownStates"), bytes, CreateMode.PERSISTENT, true);
zkController.getZkStateReader().updateClusterState(true);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkNodePropsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkNodePropsTest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkNodePropsTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkNodePropsTest.java Tue Jul 14 13:55:46 2015
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.cloud.ZkNodeProps;
-import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.util.Utils;
import org.junit.Test;
public class ZkNodePropsTest extends SolrTestCaseJ4 {
@@ -39,7 +39,7 @@ public class ZkNodePropsTest extends Sol
props.put("prop6", "value6");
ZkNodeProps zkProps = new ZkNodeProps(props);
- byte[] bytes = ZkStateReader.toJSON(zkProps);
+ byte[] bytes = Utils.toJSON(zkProps);
ZkNodeProps props2 = ZkNodeProps.load(bytes);
assertEquals("value1", props2.getStr("prop1"));
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/overseer/TestClusterStateMutator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/overseer/TestClusterStateMutator.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/overseer/TestClusterStateMutator.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/overseer/TestClusterStateMutator.java Tue Jul 14 13:55:46 2015
@@ -26,6 +26,7 @@ import org.apache.solr.common.cloud.DocC
import org.apache.solr.common.cloud.ImplicitDocRouter;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkNodeProps;
+import org.apache.solr.common.util.Utils;
public class TestClusterStateMutator extends SolrTestCaseJ4 {
public void testCreateCollection() throws Exception {
@@ -34,7 +35,7 @@ public class TestClusterStateMutator ext
ClusterState clusterState = zkStateReader.getClusterState();
ClusterStateMutator mutator = new ClusterStateMutator(zkStateReader);
- ZkNodeProps message = new ZkNodeProps(ZkNodeProps.makeMap(
+ ZkNodeProps message = new ZkNodeProps(Utils.makeMap(
"name", "xyz",
"numShards", "1"
));
@@ -45,7 +46,7 @@ public class TestClusterStateMutator ext
assertEquals(1, collection.getMaxShardsPerNode());
state = new ClusterState(-1, Collections.<String>emptySet(), Collections.singletonMap("xyz", collection));
- message = new ZkNodeProps(ZkNodeProps.makeMap(
+ message = new ZkNodeProps(Utils.makeMap(
"name", "abc",
"numShards", "2",
"router.name", "implicit",
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java Tue Jul 14 13:55:46 2015
@@ -30,6 +30,7 @@ import org.apache.solr.common.cloud.DocR
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.util.Utils;
import java.util.HashMap;
import java.util.Map;
@@ -148,9 +149,9 @@ public class ZkStateWriterTest extends S
ClusterState clusterState = writer.enqueueUpdate(reader.getClusterState(), c1, null);
writer.writePendingUpdates();
- Map map = (Map) ZkStateReader.fromJSON(zkClient.getData("/clusterstate.json", null, null, true));
+ Map map = (Map) Utils.fromJSON(zkClient.getData("/clusterstate.json", null, null, true));
assertNull(map.get("c1"));
- map = (Map) ZkStateReader.fromJSON(zkClient.getData(ZkStateReader.COLLECTIONS_ZKNODE + "/c1/state.json", null, null, true));
+ map = (Map) Utils.fromJSON(zkClient.getData(ZkStateReader.COLLECTIONS_ZKNODE + "/c1/state.json", null, null, true));
assertNotNull(map.get("c1"));
} finally {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/rule/RuleEngineTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/rule/RuleEngineTest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/rule/RuleEngineTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/rule/RuleEngineTest.java Tue Jul 14 13:55:46 2015
@@ -29,12 +29,11 @@ import java.util.Set;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.cloud.rule.ReplicaAssigner.Position;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.util.Utils;
import org.junit.Test;
import static org.apache.solr.cloud.rule.Rule.parseRule;
-import static org.apache.solr.common.cloud.ZkNodeProps.makeMap;
+import static org.apache.solr.common.util.Utils.makeMap;
public class RuleEngineTest extends SolrTestCaseJ4{
@Test
@@ -62,7 +61,7 @@ public class RuleEngineTest extends Solr
" 'node':'127.0.0.1:49958_'," +
" 'freedisk':992," +
" 'cores':1}}";
- MockSnitch.nodeVsTags = (Map) ZkStateReader.fromJSON(s.getBytes(StandardCharsets.UTF_8));
+ MockSnitch.nodeVsTags = (Map) Utils.fromJSON(s.getBytes(StandardCharsets.UTF_8));
Map shardVsReplicaCount = makeMap("shard1", 2, "shard2", 2);
List<Rule> rules = parseRules("[{'cores':'<4'}, {" +
@@ -107,7 +106,7 @@ public class RuleEngineTest extends Solr
" 'node':'127.0.0.1:49958_'," +
" 'freedisk':970," +
" 'cores':1}}";
- MockSnitch.nodeVsTags = (Map) ZkStateReader.fromJSON(s.getBytes(StandardCharsets.UTF_8));
+ MockSnitch.nodeVsTags = (Map) Utils.fromJSON(s.getBytes(StandardCharsets.UTF_8));
//test not
List<Rule> rules = parseRules(
"[{cores:'<4'}, " +
@@ -184,7 +183,7 @@ public class RuleEngineTest extends Solr
private List<Rule> parseRules(String s) {
- List maps = (List) ZkStateReader.fromJSON(s.getBytes(StandardCharsets.UTF_8));
+ List maps = (List) Utils.fromJSON(s.getBytes(StandardCharsets.UTF_8));
List<Rule> rules = new ArrayList<>();
for (Object map : maps) rules.add(new Rule((Map) map));
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestInitParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestInitParams.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestInitParams.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestInitParams.java Tue Jul 14 13:55:46 2015
@@ -18,8 +18,8 @@ package org.apache.solr.core;
*/
import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.Utils;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.SolrQueryResponse;
import org.junit.BeforeClass;
@@ -55,7 +55,7 @@ public class TestInitParams extends Solr
PluginInfo pluginInfo = new PluginInfo("requestHandler",
new HashMap<String, String>(),
- new NamedList<>(singletonMap("defaults", new NamedList(ZkNodeProps.makeMap("a", "A1")))), null);
+ new NamedList<>(singletonMap("defaults", new NamedList(Utils.makeMap("a", "A1")))), null);
initParams.apply(pluginInfo);
assertEquals( "A",initParams.defaults.get("a"));
}
@@ -117,14 +117,14 @@ public class TestInitParams extends Solr
}
public void testMatchPath(){
- InitParams initParams = new InitParams(new PluginInfo(InitParams.TYPE, ZkNodeProps.makeMap("path","/update/json/docs")));
+ InitParams initParams = new InitParams(new PluginInfo(InitParams.TYPE, Utils.makeMap("path", "/update/json/docs")));
assertFalse(initParams.matchPath("/update"));
assertTrue(initParams.matchPath("/update/json/docs"));
- initParams = new InitParams(new PluginInfo(InitParams.TYPE, ZkNodeProps.makeMap("path","/update/**")));
+ initParams = new InitParams(new PluginInfo(InitParams.TYPE, Utils.makeMap("path", "/update/**")));
assertTrue(initParams.matchPath("/update/json/docs"));
assertTrue(initParams.matchPath("/update/json"));
assertTrue(initParams.matchPath("/update"));
- initParams = new InitParams(new PluginInfo(InitParams.TYPE, ZkNodeProps.makeMap("path","/update/*")));
+ initParams = new InitParams(new PluginInfo(InitParams.TYPE, Utils.makeMap("path", "/update/*")));
assertFalse(initParams.matchPath("/update/json/docs"));
assertTrue(initParams.matchPath("/update/json"));
assertTrue(initParams.matchPath("/update"));
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java Tue Jul 14 13:55:46 2015
@@ -35,6 +35,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.common.util.StrUtils;
+import org.apache.solr.common.util.Utils;
import org.apache.solr.handler.TestBlobHandler;
import org.apache.solr.handler.TestSolrConfigHandlerConcurrent;
import org.apache.solr.util.RestTestBase;
@@ -48,7 +49,7 @@ import org.restlet.ext.servlet.ServerSer
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.solr.core.ConfigOverlay.getObjectByPath;
+import static org.apache.solr.common.util.Utils.getObjectByPath;
import static org.apache.solr.handler.TestBlobHandler.getAsString;
public class TestSolrConfigHandler extends RestTestBase {
@@ -218,7 +219,7 @@ public class TestSolrConfigHandler exten
while (TimeUnit.SECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS) < maxTimeoutSeconds) {
String uri = "/config/overlay?wt=json";
Map m = testServerBaseUrl == null ? getRespMap(uri, writeHarness) : TestSolrConfigHandlerConcurrent.getAsMap(testServerBaseUrl + uri, cloudSolrClient);
- if (null == ConfigOverlay.getObjectByPath(m, true, Arrays.asList("overlay", "requestHandler", "/x", "a"))) {
+ if (null == Utils.getObjectByPath(m, true, Arrays.asList("overlay", "requestHandler", "/x", "a"))) {
success = true;
break;
}
@@ -374,7 +375,7 @@ public class TestSolrConfigHandler exten
null,
10);
- List l = (List) ConfigOverlay.getObjectByPath(map,false, Arrays.asList("config", "initParams"));
+ List l = (List) Utils.getObjectByPath(map, false, Arrays.asList("config", "initParams"));
assertNotNull("no object /config/initParams : "+ TestBlobHandler.getAsString(map) , l);
assertEquals( 1, l.size());
assertEquals( "val", ((Map)l.get(0)).get("key") );
@@ -399,7 +400,7 @@ public class TestSolrConfigHandler exten
continue;
}
- if (Objects.equals(expected, ConfigOverlay.getObjectByPath(m, false, jsonPath))) {
+ if (Objects.equals(expected, Utils.getObjectByPath(m, false, jsonPath))) {
success = true;
break;
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java Tue Jul 14 13:55:46 2015
@@ -35,8 +35,8 @@ import org.apache.solr.common.cloud.DocC
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.util.StrUtils;
+import org.apache.solr.common.util.Utils;
import org.apache.solr.core.ConfigOverlay;
-import org.apache.solr.update.DirectUpdateHandler2;
import org.apache.solr.util.SimplePostTool;
import org.junit.Test;
import org.noggit.JSONParser;
@@ -52,7 +52,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import static org.apache.solr.core.ConfigOverlay.getObjectByPath;
+import static org.apache.solr.common.util.Utils.getObjectByPath;
public class TestBlobHandler extends AbstractFullDistribZkTestBase {
static final Logger log = LoggerFactory.getLogger(TestBlobHandler.class);
@@ -92,7 +92,7 @@ public class TestBlobHandler extends Abs
url = baseUrl + "/.system/blob/test/1";
map = TestSolrConfigHandlerConcurrent.getAsMap(url, cloudClient);
- List l = (List) ConfigOverlay.getObjectByPath(map, false, Arrays.asList("response", "docs"));
+ List l = (List) Utils.getObjectByPath(map, false, Arrays.asList("response", "docs"));
assertNotNull("" + map, l);
assertTrue("" + map, l.size() > 0);
map = (Map) l.get(0);
@@ -125,12 +125,12 @@ public class TestBlobHandler extends Abs
for (; i < 150; i++) {//15 secs
url = baseUrl + "/.system/blob/" + blobName;
map = TestSolrConfigHandlerConcurrent.getAsMap(url, cloudClient);
- String numFound = String.valueOf(ConfigOverlay.getObjectByPath(map, false, Arrays.asList("response", "numFound")));
+ String numFound = String.valueOf(Utils.getObjectByPath(map, false, Arrays.asList("response", "numFound")));
if (!("" + count).equals(numFound)) {
Thread.sleep(100);
continue;
}
- l = (List) ConfigOverlay.getObjectByPath(map, false, Arrays.asList("response", "docs"));
+ l = (List) Utils.getObjectByPath(map, false, Arrays.asList("response", "docs"));
assertNotNull(l);
map = (Map) l.get(0);
assertEquals("" + bytes.limit(), String.valueOf(map.get("size")));
@@ -141,7 +141,7 @@ public class TestBlobHandler extends Abs
}
public static String getAsString(Map map) {
- return new String(ZkStateReader.toJSON(map), StandardCharsets.UTF_8);
+ return new String(Utils.toJSON(map), StandardCharsets.UTF_8);
}
private void compareInputAndOutput(String url, byte[] bytarr) throws IOException {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java Tue Jul 14 13:55:46 2015
@@ -18,11 +18,10 @@ package org.apache.solr.handler;
*/
import static java.util.Arrays.asList;
-import static org.apache.solr.core.ConfigOverlay.getObjectByPath;
+import static org.apache.solr.common.util.Utils.getObjectByPath;
import java.io.StringReader;
import java.nio.charset.StandardCharsets;
-import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java Tue Jul 14 13:55:46 2015
@@ -18,15 +18,12 @@ package org.apache.solr.handler;
*/
-import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import org.apache.lucene.util.LuceneTestCase.BadApple;
-
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
@@ -35,7 +32,7 @@ import org.apache.solr.common.cloud.Repl
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.util.StrUtils;
-import org.apache.solr.core.ConfigOverlay;
+import org.apache.solr.common.util.Utils;
import org.apache.solr.core.RequestParams;
import org.apache.solr.core.TestSolrConfigHandler;
import org.apache.solr.util.RESTfulServerProvider;
@@ -268,7 +265,7 @@ public class TestSolrConfigHandlerCloud
public static void compareValues(Map result, Object expected, List<String> jsonPath) {
assertTrue(StrUtils.formatString("Could not get expected value {0} for path {1} full output {2}", expected, jsonPath, getAsString(result)),
- Objects.equals(expected, ConfigOverlay.getObjectByPath(result, false, jsonPath)));
+ Objects.equals(expected, Utils.getObjectByPath(result, false, jsonPath)));
}
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java Tue Jul 14 13:55:46 2015
@@ -18,12 +18,11 @@ package org.apache.solr.handler;
*/
import static java.util.Arrays.asList;
-import static org.apache.solr.core.ConfigOverlay.getObjectByPath;
+import static org.apache.solr.common.util.Utils.getObjectByPath;
import static org.noggit.ObjectBuilder.getVal;
import java.io.StringReader;
import java.nio.charset.StandardCharsets;
-import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -44,6 +43,7 @@ import org.apache.solr.common.cloud.Repl
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.util.StrUtils;
+import org.apache.solr.common.util.Utils;
import org.apache.solr.core.ConfigOverlay;
import org.apache.solr.util.RESTfulServerProvider;
import org.apache.solr.util.RestTestHarness;
@@ -160,7 +160,7 @@ public class TestSolrConfigHandlerConcur
Map map = (Map) getVal(new JSONParser(new StringReader(response)));
Object errors = map.get("errors");
if(errors!= null){
- errs.add(new String(ZkStateReader.toJSON(errors), StandardCharsets.UTF_8));
+ errs.add(new String(Utils.toJSON(errors), StandardCharsets.UTF_8));
return;
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/SmileWriterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/SmileWriterTest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/SmileWriterTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/SmileWriterTest.java Tue Jul 14 13:55:46 2015
@@ -42,10 +42,10 @@ import com.fasterxml.jackson.dataformat.
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
-import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.Utils;
import org.apache.solr.response.SmileResponseWriter;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.ReturnFields;
@@ -78,7 +78,7 @@ public class SmileWriterTest extends Sol
JSONWriter jsonWriter = new JSONWriter(out, 2);
jsonWriter.setIndentSize(-1); // indentation by default
jsonWriter.write(m);
- String s = new String(ZkStateReader.toUTF8(out), StandardCharsets.UTF_8);
+ String s = new String(Utils.toUTF8(out), StandardCharsets.UTF_8);
assertEquals(s , "{\"data1\":NaN,\"data2\":-Infinity,\"data3\":Infinity}");
req.close();
@@ -102,7 +102,7 @@ public class SmileWriterTest extends Sol
w.write(buf, req, rsp);
Map m = (Map) decodeSmile(new ByteArrayInputStream(buf.toByteArray()));
Map o2 = (Map) new ObjectBuilder(new JSONParser(new StringReader(expected))).getObject();
- assertEquals(ZkStateReader.toJSONString(m),ZkStateReader.toJSONString(o2));
+ assertEquals(Utils.toJSONString(m), Utils.toJSONString(o2));
req.close();
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java Tue Jul 14 13:55:46 2015
@@ -34,8 +34,8 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
-import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.util.StrUtils;
+import org.apache.solr.common.util.Utils;
import org.apache.solr.util.RESTfulServerProvider;
import org.apache.solr.util.RestTestHarness;
import org.junit.BeforeClass;
@@ -160,7 +160,7 @@ public class TestBulkSchemaConcurrent e
Map map = (Map) ObjectBuilder.getVal(new JSONParser(new StringReader(response)));
Object errors = map.get("errors");
if (errors != null) {
- errs.add(new String(ZkStateReader.toJSON(errors), StandardCharsets.UTF_8));
+ errs.add(new String(Utils.toJSON(errors), StandardCharsets.UTF_8));
return;
}
@@ -230,7 +230,7 @@ public class TestBulkSchemaConcurrent e
Map map = (Map) ObjectBuilder.getVal(new JSONParser(new StringReader(response)));
Object errors = map.get("errors");
if (errors != null) {
- errs.add(new String(ZkStateReader.toJSON(errors), StandardCharsets.UTF_8));
+ errs.add(new String(Utils.toJSON(errors), StandardCharsets.UTF_8));
return;
}
@@ -292,7 +292,7 @@ public class TestBulkSchemaConcurrent e
Map map = (Map) ObjectBuilder.getVal(new JSONParser(new StringReader(response)));
Object errors = map.get("errors");
if (errors != null) {
- errs.add(new String(ZkStateReader.toJSON(errors), StandardCharsets.UTF_8));
+ errs.add(new String(Utils.toJSON(errors), StandardCharsets.UTF_8));
return;
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java Tue Jul 14 13:55:46 2015
@@ -29,9 +29,9 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.client.solrj.impl.BinaryResponseParser;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.QueryRequest;
-import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.Utils;
import org.apache.solr.request.SmileWriterTest;
import org.apache.solr.search.json.TestJsonRequest;
import org.junit.AfterClass;
@@ -78,7 +78,7 @@ public class TestSmileRequest extends So
}
NamedList<Object> rsp = client.request(query);
Map m = rsp.asMap(5);
- String jsonStr = ZkStateReader.toJSONString(m);
+ String jsonStr = Utils.toJSONString(m);
SolrTestCaseHS.matchJSON(jsonStr, tests);
}
};
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java Tue Jul 14 13:55:46 2015
@@ -19,6 +19,7 @@ package org.apache.solr.common.cloud;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
+import org.apache.solr.common.util.Utils;
import org.noggit.JSONWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -248,7 +249,7 @@ public class ClusterState implements JSO
if (bytes == null || bytes.length == 0) {
return new ClusterState(version, liveNodes, Collections.<String, DocCollection>emptyMap());
}
- Map<String, Object> stateMap = (Map<String, Object>) ZkStateReader.fromJSON(bytes);
+ Map<String, Object> stateMap = (Map<String, Object>) Utils.fromJSON(bytes);
Map<String,CollectionRef> collections = new LinkedHashMap<>(stateMap.size());
for (Entry<String, Object> entry : stateMap.entrySet()) {
String collectionName = entry.getKey();
@@ -264,7 +265,7 @@ public class ClusterState implements JSO
if (bytes == null || bytes.length == 0) {
return new Aliases();
}
- Map<String,Map<String,String>> aliasMap = (Map<String,Map<String,String>>) ZkStateReader.fromJSON(bytes);
+ Map<String,Map<String,String>> aliasMap = (Map<String,Map<String,String>>) Utils.fromJSON(bytes);
return new Aliases(aliasMap);
}
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java Tue Jul 14 13:55:46 2015
@@ -17,10 +17,10 @@ package org.apache.solr.common.cloud;
* limitations under the License.
*/
+import org.apache.solr.common.util.Utils;
import org.noggit.JSONUtil;
import org.noggit.JSONWriter;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
@@ -47,22 +47,11 @@ public class ZkNodeProps implements JSON
* key2, value2, ..., keyN, valueN
*/
public ZkNodeProps(String... keyVals) {
- this( makeMap((Object[])keyVals) );
+ this( Utils.makeMap((Object[]) keyVals) );
}
public static ZkNodeProps fromKeyVals(Object... keyVals) {
- return new ZkNodeProps( makeMap(keyVals) );
- }
-
- public static Map<String,Object> makeMap(Object... keyVals) {
- if ((keyVals.length & 0x01) != 0) {
- throw new IllegalArgumentException("arguments should be key,value");
- }
- Map<String,Object> propMap = new LinkedHashMap<>(keyVals.length>>1);
- for (int i = 0; i < keyVals.length; i+=2) {
- propMap.put(keyVals[i].toString(), keyVals[i+1]);
- }
- return propMap;
+ return new ZkNodeProps( Utils.makeMap(keyVals) );
}
@@ -89,7 +78,7 @@ public class ZkNodeProps implements JSON
* Create Replica from json string that is typically stored in zookeeper.
*/
public static ZkNodeProps load(byte[] bytes) {
- Map<String, Object> props = (Map<String, Object>) ZkStateReader.fromJSON(bytes);
+ Map<String, Object> props = (Map<String, Object>) Utils.fromJSON(bytes);
return new ZkNodeProps(props);
}
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java Tue Jul 14 13:55:46 2015
@@ -18,12 +18,9 @@ package org.apache.solr.common.cloud;
*/
import java.io.Closeable;
-import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -39,17 +36,13 @@ import java.util.concurrent.TimeUnit;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.util.ByteUtils;
+import org.apache.solr.common.util.Utils;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.Watcher.Event.EventType;
import org.apache.zookeeper.data.Stat;
-import org.noggit.CharArr;
-import org.noggit.JSONParser;
-import org.noggit.JSONWriter;
-import org.noggit.ObjectBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -124,39 +117,6 @@ public class ZkStateReader implements Cl
URL_SCHEME,
AUTO_ADD_REPLICAS)));
- //
- // convenience methods... should these go somewhere else?
- //
- public static byte[] toJSON(Object o) {
- CharArr out = new CharArr();
- new JSONWriter(out, 2).write(o); // indentation by default
- return toUTF8(out);
- }
-
- public static String toJSONString(Object o) {
- return new String(toJSON(o), StandardCharsets.UTF_8);
- }
-
- public static byte[] toUTF8(CharArr out) {
- byte[] arr = new byte[out.size() << 2]; // is 4x the real worst-case upper-bound?
- int nBytes = ByteUtils.UTF16toUTF8(out, 0, out.size(), arr, 0);
- return Arrays.copyOf(arr, nBytes);
- }
-
- public static Object fromJSON(byte[] utf8) {
- // convert directly from bytes to chars
- // and parse directly from that instead of going through
- // intermediate strings or readers
- CharArr chars = new CharArr();
- ByteUtils.UTF8toUTF16(utf8, 0, utf8.length, chars);
- JSONParser parser = new JSONParser(chars.getArray(), chars.getStart(), chars.length());
- try {
- return ObjectBuilder.getVal(parser);
- } catch (IOException e) {
- throw new RuntimeException(e); // should never happen w/o using real IO
- }
- }
-
/**
* Returns config set name for collection.
*
@@ -771,7 +731,7 @@ public class ZkStateReader implements Cl
Map result = null;
try {
if(getZkClient().exists(ZkStateReader.CLUSTER_PROPS, true)){
- result = (Map) ZkStateReader.fromJSON(getZkClient().getData(ZkStateReader.CLUSTER_PROPS, null, new Stat(), true)) ;
+ result = (Map) Utils.fromJSON(getZkClient().getData(ZkStateReader.CLUSTER_PROPS, null, new Stat(), true)) ;
} else {
result= new LinkedHashMap();
}
@@ -797,24 +757,24 @@ public class ZkStateReader implements Cl
try {
if (getZkClient().exists(CLUSTER_PROPS, true)) {
int v = 0;
- Map properties = (Map) fromJSON(getZkClient().getData(CLUSTER_PROPS, null, s, true));
+ Map properties = (Map) Utils.fromJSON(getZkClient().getData(CLUSTER_PROPS, null, s, true));
if (propertyValue == null) {
//Don't update ZK unless absolutely necessary.
if (properties.get(propertyName) != null) {
properties.remove(propertyName);
- getZkClient().setData(CLUSTER_PROPS, toJSON(properties), s.getVersion(), true);
+ getZkClient().setData(CLUSTER_PROPS, Utils.toJSON(properties), s.getVersion(), true);
}
} else {
//Don't update ZK unless absolutely necessary.
if (!propertyValue.equals(properties.get(propertyName))) {
properties.put(propertyName, propertyValue);
- getZkClient().setData(CLUSTER_PROPS, toJSON(properties), s.getVersion(), true);
+ getZkClient().setData(CLUSTER_PROPS, Utils.toJSON(properties), s.getVersion(), true);
}
}
} else {
Map properties = new LinkedHashMap();
properties.put(propertyName, propertyValue);
- getZkClient().create(CLUSTER_PROPS, toJSON(properties), CreateMode.PERSISTENT, true);
+ getZkClient().create(CLUSTER_PROPS, Utils.toJSON(properties), CreateMode.PERSISTENT, true);
}
} catch (KeeperException.BadVersionException bve) {
log.warn("Race condition while trying to set a new cluster prop on current version " + s.getVersion());
@@ -841,7 +801,7 @@ public class ZkStateReader implements Cl
public Map getSecurityProps() {
try {
if(getZkClient().exists(SOLR_SECURITY_CONF_PATH, true)) {
- return (Map) ZkStateReader.fromJSON(getZkClient()
+ return (Map) Utils.fromJSON(getZkClient()
.getData(ZkStateReader.SOLR_SECURITY_CONF_PATH, null, new Stat(), true)) ;
}
} catch (KeeperException | InterruptedException e) {
Added: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/Utils.java?rev=1690935&view=auto
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/Utils.java (added)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/Utils.java Tue Jul 14 13:55:46 2015
@@ -0,0 +1,117 @@
+package org.apache.solr.common.util;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.noggit.CharArr;
+import org.noggit.JSONParser;
+import org.noggit.JSONWriter;
+import org.noggit.ObjectBuilder;
+
+public class Utils {
+ public static Map getDeepCopy(Map map, int maxDepth) {
+ Map copy = new LinkedHashMap<>();
+ for (Object o : map.entrySet()) {
+ Map.Entry e = (Map.Entry) o;
+ Object v = e.getValue();
+ if (v instanceof Map && maxDepth > 0) {
+ v = getDeepCopy((Map) v, maxDepth - 1);
+ } else if (v instanceof Set) {
+ v = new HashSet((Set) v);
+ } else if (v instanceof List) {
+ v = new ArrayList((List) v);
+ }
+ copy.put(e.getKey(), v);
+ }
+ return copy;
+ }
+
+ //
+ // convenience methods... should these go somewhere else?
+ //
+ public static byte[] toJSON(Object o) {
+ CharArr out = new CharArr();
+ new JSONWriter(out, 2).write(o); // indentation by default
+ return toUTF8(out);
+ }
+
+ public static String toJSONString(Object o) {
+ return new String(toJSON(o), StandardCharsets.UTF_8);
+ }
+
+ public static byte[] toUTF8(CharArr out) {
+ byte[] arr = new byte[out.size() << 2]; // is 4x the real worst-case upper-bound?
+ int nBytes = ByteUtils.UTF16toUTF8(out, 0, out.size(), arr, 0);
+ return Arrays.copyOf(arr, nBytes);
+ }
+
+ public static Object fromJSON(byte[] utf8) {
+ // convert directly from bytes to chars
+ // and parse directly from that instead of going through
+ // intermediate strings or readers
+ CharArr chars = new CharArr();
+ ByteUtils.UTF8toUTF16(utf8, 0, utf8.length, chars);
+ JSONParser parser = new JSONParser(chars.getArray(), chars.getStart(), chars.length());
+ try {
+ return ObjectBuilder.getVal(parser);
+ } catch (IOException e) {
+ throw new RuntimeException(e); // should never happen w/o using real IO
+ }
+ }
+
+ public static Map<String,Object> makeMap(Object... keyVals) {
+ if ((keyVals.length & 0x01) != 0) {
+ throw new IllegalArgumentException("arguments should be key,value");
+ }
+ Map<String,Object> propMap = new LinkedHashMap<>(keyVals.length>>1);
+ for (int i = 0; i < keyVals.length; i+=2) {
+ propMap.put(keyVals[i].toString(), keyVals[i+1]);
+ }
+ return propMap;
+ }
+
+ public static Object getObjectByPath(Map root, boolean onlyPrimitive, List<String> hierarchy) {
+ Map obj = root;
+ for (int i = 0; i < hierarchy.size(); i++) {
+ String s = hierarchy.get(i);
+ if (i < hierarchy.size() - 1) {
+ if (!(obj.get(s) instanceof Map)) return null;
+ obj = (Map) obj.get(s);
+ if (obj == null) return null;
+ } else {
+ Object val = obj.get(s);
+ if (onlyPrimitive && val instanceof Map) {
+ return null;
+ }
+ return val;
+ }
+ }
+
+ return false;
+ }
+}
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java Tue Jul 14 13:55:46 2015
@@ -45,7 +45,6 @@ import org.apache.solr.common.params.Mod
import org.apache.solr.common.params.ShardParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
-import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
@@ -68,7 +67,7 @@ import java.util.Set;
import java.util.concurrent.TimeoutException;
import static org.apache.solr.cloud.OverseerCollectionProcessor.NUM_SLICES;
-import static org.apache.solr.common.cloud.ZkNodeProps.makeMap;
+import static org.apache.solr.common.util.Utils.makeMap;
import static org.apache.solr.common.cloud.ZkStateReader.MAX_SHARDS_PER_NODE;
import static org.apache.solr.common.cloud.ZkStateReader.REPLICATION_FACTOR;
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java Tue Jul 14 13:55:46 2015
@@ -40,7 +40,6 @@ import org.apache.solr.common.SolrDocume
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.SolrInputField;
-import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.util.ConcurrentLRUCache;
import org.junit.Test;
import org.noggit.CharArr;
@@ -306,7 +305,7 @@ public class TestJavaBinCodec extends So
}
@Test
public void testStringCaching() throws Exception {
- Map<String, Object> m = ZkNodeProps.makeMap("key1", "val1", "key2", "val2");
+ Map<String, Object> m = Utils.makeMap("key1", "val1", "key2", "val2");
ByteArrayOutputStream os1 = new ByteArrayOutputStream();
new JavaBinCodec().marshal(m, os1);
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Tue Jul 14 13:55:46 2015
@@ -36,7 +36,6 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.http.params.CoreConnectionPNames;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery;
@@ -69,6 +68,7 @@ import org.apache.solr.common.params.Mod
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.StrUtils;
+import org.apache.solr.common.util.Utils;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
import org.apache.solr.servlet.SolrDispatchFilter;
@@ -84,7 +84,7 @@ import org.slf4j.LoggerFactory;
import static org.apache.solr.cloud.OverseerCollectionProcessor.CREATE_NODE_SET;
import static org.apache.solr.cloud.OverseerCollectionProcessor.NUM_SLICES;
import static org.apache.solr.cloud.OverseerCollectionProcessor.SHARDS_PROP;
-import static org.apache.solr.common.cloud.ZkNodeProps.makeMap;
+import static org.apache.solr.common.util.Utils.makeMap;
/**
* TODO: we should still test this works as a custom update chain as well as
@@ -205,7 +205,7 @@ public abstract class AbstractFullDistri
try (ZkStateReader zkStateReader = new ZkStateReader(zkServer.getZkAddress(),
AbstractZkTestCase.TIMEOUT, AbstractZkTestCase.TIMEOUT)) {
zkStateReader.getZkClient().create(ZkStateReader.CLUSTER_PROPS,
- ZkStateReader.toJSON(Collections.singletonMap("urlScheme", "https")),
+ Utils.toJSON(Collections.singletonMap("urlScheme", "https")),
CreateMode.PERSISTENT, true);
}
}
@@ -356,7 +356,7 @@ public abstract class AbstractFullDistri
SolrZkClient zkClient = new SolrZkClient(zkServer.getZkAddress(),
AbstractZkTestCase.TIMEOUT, AbstractZkTestCase.TIMEOUT);
Overseer.getInQueue(zkClient).offer(
- ZkStateReader.toJSON(ZkNodeProps.makeMap(Overseer.QUEUE_OPERATION,
+ Utils.toJSON(Utils.makeMap(Overseer.QUEUE_OPERATION,
CollectionParams.CollectionAction.CREATE.toLower(), "name",
DEFAULT_COLLECTION, "numShards", String.valueOf(sliceCount),
DocCollection.STATE_FORMAT, getStateFormat())));
@@ -1579,7 +1579,7 @@ public abstract class AbstractFullDistri
String collectionName, int numShards, int replicationFactor, int maxShardsPerNode, SolrClient client, String createNodeSetStr) throws SolrServerException, IOException {
return createCollection(collectionInfos, collectionName,
- ZkNodeProps.makeMap(
+ Utils.makeMap(
NUM_SLICES, numShards,
ZkStateReader.REPLICATION_FACTOR, replicationFactor,
CREATE_NODE_SET, createNodeSetStr,
@@ -1591,7 +1591,7 @@ public abstract class AbstractFullDistri
String collectionName, int numShards, int replicationFactor, int maxShardsPerNode, SolrClient client, String createNodeSetStr, String configName) throws SolrServerException, IOException {
return createCollection(collectionInfos, collectionName,
- ZkNodeProps.makeMap(
+ Utils.makeMap(
NUM_SLICES, numShards,
ZkStateReader.REPLICATION_FACTOR, replicationFactor,
CREATE_NODE_SET, createNodeSetStr,
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java?rev=1690935&r1=1690934&r2=1690935&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java Tue Jul 14 13:55:46 2015
@@ -20,7 +20,7 @@ package org.apache.solr.cloud;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkNodeProps;
-import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.util.Utils;
import org.apache.zookeeper.CreateMode;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -96,9 +96,9 @@ public abstract class AbstractZkTestCase
props.put("configName", "conf1");
final ZkNodeProps zkProps = new ZkNodeProps(props);
- zkClient.makePath("/collections/collection1", ZkStateReader.toJSON(zkProps), CreateMode.PERSISTENT, true);
+ zkClient.makePath("/collections/collection1", Utils.toJSON(zkProps), CreateMode.PERSISTENT, true);
zkClient.makePath("/collections/collection1/shards", CreateMode.PERSISTENT, true);
- zkClient.makePath("/collections/control_collection", ZkStateReader.toJSON(zkProps), CreateMode.PERSISTENT, true);
+ zkClient.makePath("/collections/control_collection", Utils.toJSON(zkProps), CreateMode.PERSISTENT, true);
zkClient.makePath("/collections/control_collection/shards", CreateMode.PERSISTENT, true);
// for now, always upload the config and schema to the canonical names