You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/03/12 15:39:39 UTC
svn commit: r1576755 [23/27] - in /lucene/dev/trunk: lucene/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/
lucene/analysis/common/src/java/org/apache/lucene/a...
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetTest.java Wed Mar 12 14:39:17 2014
@@ -101,48 +101,48 @@ public class FieldFacetTest extends Abst
defaults.put("string", "str0");
//INT
- intDateTestStart = new ArrayList<ArrayList<Integer>>();
- intDateTestMissing = new ArrayList<Long>();
- intStringTestStart = new ArrayList<ArrayList<Integer>>();
- intStringTestMissing = new ArrayList<Long>();
+ intDateTestStart = new ArrayList<>();
+ intDateTestMissing = new ArrayList<>();
+ intStringTestStart = new ArrayList<>();
+ intStringTestMissing = new ArrayList<>();
//LONG
- longDateTestStart = new ArrayList<ArrayList<Long>>();
- longDateTestMissing = new ArrayList<Long>();
- longStringTestStart = new ArrayList<ArrayList<Long>>();
- longStringTestMissing = new ArrayList<Long>();
+ longDateTestStart = new ArrayList<>();
+ longDateTestMissing = new ArrayList<>();
+ longStringTestStart = new ArrayList<>();
+ longStringTestMissing = new ArrayList<>();
//FLOAT
- floatDateTestStart = new ArrayList<ArrayList<Float>>();
- floatDateTestMissing = new ArrayList<Long>();
- floatStringTestStart = new ArrayList<ArrayList<Float>>();
- floatStringTestMissing = new ArrayList<Long>();
+ floatDateTestStart = new ArrayList<>();
+ floatDateTestMissing = new ArrayList<>();
+ floatStringTestStart = new ArrayList<>();
+ floatStringTestMissing = new ArrayList<>();
//DOUBLE
- doubleDateTestStart = new ArrayList<ArrayList<Double>>();
- doubleDateTestMissing = new ArrayList<Long>();
- doubleStringTestStart = new ArrayList<ArrayList<Double>>();
- doubleStringTestMissing = new ArrayList<Long>();
+ doubleDateTestStart = new ArrayList<>();
+ doubleDateTestMissing = new ArrayList<>();
+ doubleStringTestStart = new ArrayList<>();
+ doubleStringTestMissing = new ArrayList<>();
//DATE
- dateIntTestStart = new ArrayList<ArrayList<String>>();
- dateIntTestMissing = new ArrayList<Long>();
- dateLongTestStart = new ArrayList<ArrayList<String>>();
- dateLongTestMissing = new ArrayList<Long>();
+ dateIntTestStart = new ArrayList<>();
+ dateIntTestMissing = new ArrayList<>();
+ dateLongTestStart = new ArrayList<>();
+ dateLongTestMissing = new ArrayList<>();
//String
- stringIntTestStart = new ArrayList<ArrayList<String>>();
- stringIntTestMissing = new ArrayList<Long>();
- stringLongTestStart = new ArrayList<ArrayList<String>>();
- stringLongTestMissing = new ArrayList<Long>();
+ stringIntTestStart = new ArrayList<>();
+ stringIntTestMissing = new ArrayList<>();
+ stringLongTestStart = new ArrayList<>();
+ stringLongTestMissing = new ArrayList<>();
//Multi-Valued
- multiLongTestStart = new ArrayList<ArrayList<Integer>>();
- multiLongTestMissing = new ArrayList<Long>();
- multiStringTestStart = new ArrayList<ArrayList<Integer>>();
- multiStringTestMissing = new ArrayList<Long>();
- multiDateTestStart = new ArrayList<ArrayList<Integer>>();
- multiDateTestMissing = new ArrayList<Long>();
+ multiLongTestStart = new ArrayList<>();
+ multiLongTestMissing = new ArrayList<>();
+ multiStringTestStart = new ArrayList<>();
+ multiStringTestMissing = new ArrayList<>();
+ multiDateTestStart = new ArrayList<>();
+ multiDateTestMissing = new ArrayList<>();
for (int j = 0; j < NUM_LOOPS; ++j) {
int i = j%INT;
@@ -178,7 +178,7 @@ public class FieldFacetTest extends Abst
if( dt != 0 ){
//Dates
if (j-DATE<0) {
- ArrayList<Integer> list1 = new ArrayList<Integer>();
+ ArrayList<Integer> list1 = new ArrayList<>();
if( i != 0 ){
list1.add(i);
intDateTestMissing.add(0l);
@@ -186,7 +186,7 @@ public class FieldFacetTest extends Abst
intDateTestMissing.add(1l);
}
intDateTestStart.add(list1);
- ArrayList<Long> list2 = new ArrayList<Long>();
+ ArrayList<Long> list2 = new ArrayList<>();
if( l != 0l ){
list2.add(l);
longDateTestMissing.add(0l);
@@ -194,7 +194,7 @@ public class FieldFacetTest extends Abst
longDateTestMissing.add(1l);
}
longDateTestStart.add(list2);
- ArrayList<Float> list3 = new ArrayList<Float>();
+ ArrayList<Float> list3 = new ArrayList<>();
if ( f != 0.0f ){
list3.add(f);
floatDateTestMissing.add(0l);
@@ -203,7 +203,7 @@ public class FieldFacetTest extends Abst
}
floatDateTestStart.add(list3);
- ArrayList<Double> list4 = new ArrayList<Double>();
+ ArrayList<Double> list4 = new ArrayList<>();
if( d != 0.0d ){
list4.add(d);
doubleDateTestMissing.add(0l);
@@ -211,7 +211,7 @@ public class FieldFacetTest extends Abst
doubleDateTestMissing.add(1l);
}
doubleDateTestStart.add(list4);
- ArrayList<Integer> list5 = new ArrayList<Integer>();
+ ArrayList<Integer> list5 = new ArrayList<>();
if( i != 0 ){
list5.add(i);
multiDateTestMissing.add(0l);
@@ -230,7 +230,7 @@ public class FieldFacetTest extends Abst
}
if (j-DATEM<0 && dtm!=dt && dtm!=0) {
- ArrayList<Integer> list1 = new ArrayList<Integer>();
+ ArrayList<Integer> list1 = new ArrayList<>();
if( i != 0 ){
list1.add(i);
multiDateTestMissing.add(0l);
@@ -245,7 +245,7 @@ public class FieldFacetTest extends Abst
if( s != 0 ){
//Strings
if (j-STRING<0) {
- ArrayList<Integer> list1 = new ArrayList<Integer>();
+ ArrayList<Integer> list1 = new ArrayList<>();
if( i != 0 ){
list1.add(i);
intStringTestMissing.add(0l);
@@ -253,7 +253,7 @@ public class FieldFacetTest extends Abst
intStringTestMissing.add(1l);
}
intStringTestStart.add(list1);
- ArrayList<Long> list2 = new ArrayList<Long>();
+ ArrayList<Long> list2 = new ArrayList<>();
if( l != 0l ){
list2.add(l);
longStringTestMissing.add(0l);
@@ -261,7 +261,7 @@ public class FieldFacetTest extends Abst
longStringTestMissing.add(1l);
}
longStringTestStart.add(list2);
- ArrayList<Float> list3 = new ArrayList<Float>();
+ ArrayList<Float> list3 = new ArrayList<>();
if( f != 0.0f ){
list3.add(f);
floatStringTestMissing.add(0l);
@@ -269,7 +269,7 @@ public class FieldFacetTest extends Abst
floatStringTestMissing.add(1l);
}
floatStringTestStart.add(list3);
- ArrayList<Double> list4 = new ArrayList<Double>();
+ ArrayList<Double> list4 = new ArrayList<>();
if( d != 0.0d ){
list4.add(d);
doubleStringTestMissing.add(0l);
@@ -277,7 +277,7 @@ public class FieldFacetTest extends Abst
doubleStringTestMissing.add(1l);
}
doubleStringTestStart.add(list4);
- ArrayList<Integer> list5 = new ArrayList<Integer>();
+ ArrayList<Integer> list5 = new ArrayList<>();
if( i != 0 ){
list5.add(i);
multiStringTestMissing.add(0l);
@@ -297,7 +297,7 @@ public class FieldFacetTest extends Abst
//Strings
if( sm != 0 ){
if (j-STRINGM<0&&sm!=s) {
- ArrayList<Integer> list1 = new ArrayList<Integer>();
+ ArrayList<Integer> list1 = new ArrayList<>();
if( i != 0 ){
list1.add(i);
multiStringTestMissing.add(0l);
@@ -313,7 +313,7 @@ public class FieldFacetTest extends Abst
//Int
if( i != 0 ){
if (j-INT<0) {
- ArrayList<String> list1 = new ArrayList<String>();
+ ArrayList<String> list1 = new ArrayList<>();
if( dt != 0 ){
list1.add((1800+dt) + "-12-31T23:59:59Z");
dateIntTestMissing.add(0l);
@@ -321,7 +321,7 @@ public class FieldFacetTest extends Abst
dateIntTestMissing.add(1l);
}
dateIntTestStart.add(list1);
- ArrayList<String> list2 = new ArrayList<String>();
+ ArrayList<String> list2 = new ArrayList<>();
if( s != 0 ){
list2.add("str"+s);
stringIntTestMissing.add(0l);
@@ -338,7 +338,7 @@ public class FieldFacetTest extends Abst
//Long
if( l != 0 ){
if (j-LONG<0) {
- ArrayList<String> list1 = new ArrayList<String>();
+ ArrayList<String> list1 = new ArrayList<>();
if( dt != 0 ){
list1.add((1800+dt) + "-12-31T23:59:59Z");
dateLongTestMissing.add(0l);
@@ -346,7 +346,7 @@ public class FieldFacetTest extends Abst
dateLongTestMissing.add(1l);
}
dateLongTestStart.add(list1);
- ArrayList<String> list2 = new ArrayList<String>();
+ ArrayList<String> list2 = new ArrayList<>();
if( s != 0 ){
list2.add("str"+s);
stringLongTestMissing.add(0l);
@@ -354,7 +354,7 @@ public class FieldFacetTest extends Abst
stringLongTestMissing.add(1l);
}
stringLongTestStart.add(list2);
- ArrayList<Integer> list3 = new ArrayList<Integer>();
+ ArrayList<Integer> list3 = new ArrayList<>();
if( i != 0 ){
list3.add(i);
multiLongTestMissing.add(0l);
@@ -372,7 +372,7 @@ public class FieldFacetTest extends Abst
//Long
if( lm != 0 ){
if (j-LONGM<0&&lm!=l) {
- ArrayList<Integer> list1 = new ArrayList<Integer>();
+ ArrayList<Integer> list1 = new ArrayList<>();
if( i != 0 ){
list1.add(i);
multiLongTestMissing.add(0l);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java Wed Mar 12 14:39:17 2014
@@ -46,18 +46,18 @@ public class QueryFacetTest extends Abst
public void queryTest() throws Exception {
h.update("<delete><query>*:*</query></delete>");
//INT
- ArrayList<ArrayList<Integer>> int1TestStart = new ArrayList<ArrayList<Integer>>();
+ ArrayList<ArrayList<Integer>> int1TestStart = new ArrayList<>();
int1TestStart.add(new ArrayList<Integer>());
- ArrayList<ArrayList<Integer>> int2TestStart = new ArrayList<ArrayList<Integer>>();
+ ArrayList<ArrayList<Integer>> int2TestStart = new ArrayList<>();
int2TestStart.add(new ArrayList<Integer>());
//LONG
- ArrayList<ArrayList<Long>> longTestStart = new ArrayList<ArrayList<Long>>();
+ ArrayList<ArrayList<Long>> longTestStart = new ArrayList<>();
longTestStart.add(new ArrayList<Long>());
longTestStart.add(new ArrayList<Long>());
//FLOAT
- ArrayList<ArrayList<Float>> floatTestStart = new ArrayList<ArrayList<Float>>();
+ ArrayList<ArrayList<Float>> floatTestStart = new ArrayList<>();
floatTestStart.add(new ArrayList<Float>());
floatTestStart.add(new ArrayList<Float>());
floatTestStart.add(new ArrayList<Float>());
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/RangeFacetTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/RangeFacetTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/RangeFacetTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/RangeFacetTest.java Wed Mar 12 14:39:17 2014
@@ -53,14 +53,14 @@ public class RangeFacetTest extends Abst
h.update("<delete><query>*:*</query></delete>");
//INT
- intLongTestStart = new ArrayList<ArrayList<Integer>>();
- intDoubleTestStart = new ArrayList<ArrayList<Integer>>();
- intDateTestStart = new ArrayList<ArrayList<Integer>>();
+ intLongTestStart = new ArrayList<>();
+ intDoubleTestStart = new ArrayList<>();
+ intDateTestStart = new ArrayList<>();
//FLOAT
- floatLongTestStart = new ArrayList<ArrayList<Float>>();
- floatDoubleTestStart = new ArrayList<ArrayList<Float>>();
- floatDateTestStart = new ArrayList<ArrayList<Float>>();
+ floatLongTestStart = new ArrayList<>();
+ floatDoubleTestStart = new ArrayList<>();
+ floatDateTestStart = new ArrayList<>();
for (int j = 0; j < NUM_LOOPS; ++j) {
int i = j%INT;
@@ -73,10 +73,10 @@ public class RangeFacetTest extends Abst
"double_dd", "" + d, "date_dtd", (1000+dt) + "-01-01T23:59:59Z", "string_sd", "abc" + s));
//Longs
if (j-LONG<0) {
- ArrayList<Integer> list1 = new ArrayList<Integer>();
+ ArrayList<Integer> list1 = new ArrayList<>();
list1.add(i);
intLongTestStart.add(list1);
- ArrayList<Float> list2 = new ArrayList<Float>();
+ ArrayList<Float> list2 = new ArrayList<>();
list2.add(f);
floatLongTestStart.add(list2);
} else {
@@ -85,10 +85,10 @@ public class RangeFacetTest extends Abst
}
//Doubles
if (j-DOUBLE<0) {
- ArrayList<Integer> list1 = new ArrayList<Integer>();
+ ArrayList<Integer> list1 = new ArrayList<>();
list1.add(i);
intDoubleTestStart.add(list1);
- ArrayList<Float> list2 = new ArrayList<Float>();
+ ArrayList<Float> list2 = new ArrayList<>();
list2.add(f);
floatDoubleTestStart.add(list2);
} else {
@@ -97,10 +97,10 @@ public class RangeFacetTest extends Abst
}
//Dates
if (j-DATE<0) {
- ArrayList<Integer> list1 = new ArrayList<Integer>();
+ ArrayList<Integer> list1 = new ArrayList<>();
list1.add(i);
intDateTestStart.add(list1);
- ArrayList<Float> list2 = new ArrayList<Float>();
+ ArrayList<Float> list2 = new ArrayList<>();
list2.add(f);
floatDateTestStart.add(list2);
} else {
@@ -235,11 +235,11 @@ public class RangeFacetTest extends Abst
end+=gap-off;
}
- ArrayList<ArrayList<T>> lists = new ArrayList<ArrayList<T>>();
- ArrayList<T> between = new ArrayList<T>();
+ ArrayList<ArrayList<T>> lists = new ArrayList<>();
+ ArrayList<T> between = new ArrayList<>();
if (incLow && incUp) {
for (int i = start; i<end && i<listsStart.size(); i+=gap) {
- ArrayList<T> list = new ArrayList<T>();
+ ArrayList<T> list = new ArrayList<>();
for (int j = i; j<=i+gap && j<=end && j<listsStart.size(); j++) {
list.addAll(listsStart.get(j));
}
@@ -250,7 +250,7 @@ public class RangeFacetTest extends Abst
}
} else if (incLow && !incUp) {
for (int i = start; i<end && i<listsStart.size(); i+=gap) {
- ArrayList<T> list = new ArrayList<T>();
+ ArrayList<T> list = new ArrayList<>();
for (int j = i; j<i+gap && j<end && j<listsStart.size(); j++) {
list.addAll(listsStart.get(j));
}
@@ -261,7 +261,7 @@ public class RangeFacetTest extends Abst
}
} else if (!incLow && incUp) {
for (int i = start; i<end && i<listsStart.size(); i+=gap) {
- ArrayList<T> list = new ArrayList<T>();
+ ArrayList<T> list = new ArrayList<>();
for (int j = i+1; j<=i+gap && j<=end && j<listsStart.size(); j++) {
list.addAll(listsStart.get(j));
}
@@ -272,7 +272,7 @@ public class RangeFacetTest extends Abst
}
} else {
for (int i = start; i<end && i<listsStart.size(); i+=gap) {
- ArrayList<T> list = new ArrayList<T>();
+ ArrayList<T> list = new ArrayList<>();
for (int j = i+1; j<i+gap && j<end && j<listsStart.size(); j++) {
list.addAll(listsStart.get(j));
}
@@ -291,8 +291,8 @@ public class RangeFacetTest extends Abst
lists.get(lists.size()-1).addAll(listsStart.get(end));
between.addAll(listsStart.get(end));
}
- ArrayList<T> before = new ArrayList<T>();
- ArrayList<T> after = new ArrayList<T>();
+ ArrayList<T> before = new ArrayList<>();
+ ArrayList<T> after = new ArrayList<>();
if (incOut || !(incLow||incEdge)) {
for (int i = 0; i<=start; i++) {
before.addAll(listsStart.get(i));
@@ -341,8 +341,8 @@ public class RangeFacetTest extends Abst
end+=last-off;
}
- ArrayList<ArrayList<T>> lists = new ArrayList<ArrayList<T>>();
- ArrayList<T> between = new ArrayList<T>();
+ ArrayList<ArrayList<T>> lists = new ArrayList<>();
+ ArrayList<T> between = new ArrayList<>();
int gap = 0;
int gapCounter = 0;
if (incLow && incUp) {
@@ -350,7 +350,7 @@ public class RangeFacetTest extends Abst
if (gapCounter<gaps.length) {
gap = gaps[gapCounter++];
}
- ArrayList<T> list = new ArrayList<T>();
+ ArrayList<T> list = new ArrayList<>();
for (int j = i; j<=i+gap && j<=end && j<listsStart.size(); j++) {
list.addAll(listsStart.get(j));
}
@@ -364,7 +364,7 @@ public class RangeFacetTest extends Abst
if (gapCounter<gaps.length) {
gap = gaps[gapCounter++];
}
- ArrayList<T> list = new ArrayList<T>();
+ ArrayList<T> list = new ArrayList<>();
for (int j = i; j<i+gap && j<end && j<listsStart.size(); j++) {
list.addAll(listsStart.get(j));
}
@@ -378,7 +378,7 @@ public class RangeFacetTest extends Abst
if (gapCounter<gaps.length) {
gap = gaps[gapCounter++];
}
- ArrayList<T> list = new ArrayList<T>();
+ ArrayList<T> list = new ArrayList<>();
for (int j = i+1; j<=i+gap && j<=end && j<listsStart.size(); j++) {
list.addAll(listsStart.get(j));
}
@@ -392,7 +392,7 @@ public class RangeFacetTest extends Abst
if (gapCounter<gaps.length) {
gap = gaps[gapCounter++];
}
- ArrayList<T> list = new ArrayList<T>();
+ ArrayList<T> list = new ArrayList<>();
for (int j = i+1; j<i+gap && j<end && j<listsStart.size(); j++) {
list.addAll(listsStart.get(j));
}
@@ -411,8 +411,8 @@ public class RangeFacetTest extends Abst
lists.get(lists.size()-1).addAll(listsStart.get(end));
between.addAll(listsStart.get(end));
}
- ArrayList<T> before = new ArrayList<T>();
- ArrayList<T> after = new ArrayList<T>();
+ ArrayList<T> before = new ArrayList<>();
+ ArrayList<T> after = new ArrayList<>();
if (incOut || !(incLow||incEdge)) {
for (int i = 0; i<=start; i++) {
before.addAll(listsStart.get(i));
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java Wed Mar 12 14:39:17 2014
@@ -91,7 +91,7 @@ public class AliasIntegrationTest extend
createCollection("collection2", 2, 1, 10);
- List<Integer> numShardsNumReplicaList = new ArrayList<Integer>(2);
+ List<Integer> numShardsNumReplicaList = new ArrayList<>(2);
numShardsNumReplicaList.add(2);
numShardsNumReplicaList.add(1);
checkForCollection("collection2", numShardsNumReplicaList, null);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AssignTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AssignTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AssignTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AssignTest.java Wed Mar 12 14:39:17 2014
@@ -58,11 +58,11 @@ public class AssignTest extends SolrTest
public void testAssignNode() throws Exception {
String cname = "collection1";
- Map<String,DocCollection> collectionStates = new HashMap<String,DocCollection>();
+ Map<String,DocCollection> collectionStates = new HashMap<>();
- Map<String,Slice> slices = new HashMap<String,Slice>();
+ Map<String,Slice> slices = new HashMap<>();
- Map<String,Replica> replicas = new HashMap<String,Replica>();
+ Map<String,Replica> replicas = new HashMap<>();
ZkNodeProps m = new ZkNodeProps(Overseer.QUEUE_OPERATION, "state",
ZkStateReader.STATE_PROP, "ACTIVE",
@@ -85,7 +85,7 @@ public class AssignTest extends SolrTest
collectionStates.put(cname, docCollection);
- Set<String> liveNodes = new HashSet<String>();
+ Set<String> liveNodes = new HashSet<>();
ClusterState state = new ClusterState(-1,liveNodes, collectionStates,ClusterStateTest.getMockZkStateReader(collectionStates.keySet()));
String nodeName = Assign.assignNode("collection1", state);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java Wed Mar 12 14:39:17 2014
@@ -99,7 +99,7 @@ public class BasicDistributedZkTest exte
String missingField="ignore_exception__missing_but_valid_field_t";
String invalidField="ignore_exception__invalid_field_not_in_schema";
- private Map<String,List<SolrServer>> otherCollectionClients = new HashMap<String,List<SolrServer>>();
+ private Map<String,List<SolrServer>> otherCollectionClients = new HashMap<>();
private String oneInstanceCollection = "oneInstanceCollection";
private String oneInstanceCollection2 = "oneInstanceCollection2";
@@ -131,8 +131,8 @@ public class BasicDistributedZkTest exte
sliceCount = 2;
shardCount = 4;
- completionService = new ExecutorCompletionService<Object>(executor);
- pending = new HashSet<Future<Object>>();
+ completionService = new ExecutorCompletionService<>(executor);
+ pending = new HashSet<>();
}
@@ -418,12 +418,12 @@ public class BasicDistributedZkTest exte
private void testShardParamVariations() throws Exception {
SolrQuery query = new SolrQuery("*:*");
- Map<String,Long> shardCounts = new HashMap<String,Long>();
+ Map<String,Long> shardCounts = new HashMap<>();
for (String shard : shardToJetty.keySet()) {
// every client should give the same numDocs for this shard
// shffle the clients in a diff order for each shard
- List<SolrServer> solrclients = new ArrayList<SolrServer>(this.clients);
+ List<SolrServer> solrclients = new ArrayList<>(this.clients);
Collections.shuffle(solrclients, random());
for (SolrServer client : solrclients) {
query.set("shards", shard);
@@ -437,11 +437,11 @@ public class BasicDistributedZkTest exte
shardCounts.get(shard).longValue(), numDocs);
List<CloudJettyRunner> replicaJetties
- = new ArrayList<CloudJettyRunner>(shardToJetty.get(shard));
+ = new ArrayList<>(shardToJetty.get(shard));
Collections.shuffle(replicaJetties, random());
// each replica should also give the same numDocs
- ArrayList<String> replicaAlts = new ArrayList<String>(replicaJetties.size() * 2);
+ ArrayList<String> replicaAlts = new ArrayList<>(replicaJetties.size() * 2);
for (CloudJettyRunner replicaJetty : shardToJetty.get(shard)) {
String replica = replicaJetty.url;
query.set("shards", replica);
@@ -474,7 +474,7 @@ public class BasicDistributedZkTest exte
// sums of multiple shards should add up regardless of how we
// query those shards or which client we use
long randomShardCountsExpected = 0;
- ArrayList<String> randomShards = new ArrayList<String>(shardCounts.size());
+ ArrayList<String> randomShards = new ArrayList<>(shardCounts.size());
for (Map.Entry<String,Long> shardData : shardCounts.entrySet()) {
if (random().nextBoolean() || randomShards.size() < 2) {
String shard = shardData.getKey();
@@ -484,7 +484,7 @@ public class BasicDistributedZkTest exte
randomShards.add(shard);
} else {
// use some set explicit replicas
- ArrayList<String> replicas = new ArrayList<String>(7);
+ ArrayList<String> replicas = new ArrayList<>(7);
for (CloudJettyRunner replicaJetty : shardToJetty.get(shard)) {
if (0 == random().nextInt(3) || 0 == replicas.size()) {
replicas.add(replicaJetty.url);
@@ -604,7 +604,7 @@ public class BasicDistributedZkTest exte
if (createNodeSetStr != null) params.set(OverseerCollectionProcessor.CREATE_NODE_SET, createNodeSetStr);
int clientIndex = clients.size() > 1 ? random().nextInt(2) : 0;
- List<Integer> list = new ArrayList<Integer>();
+ List<Integer> list = new ArrayList<>();
list.add(numShards);
list.add(numReplicas);
if (collectionInfos != null) {
@@ -709,7 +709,7 @@ public class BasicDistributedZkTest exte
sd = sdoc("id", 1000, "foo_i",5);
clients.get(0).add(sd);
- List<Integer> expected = new ArrayList<Integer>();
+ List<Integer> expected = new ArrayList<>();
int val = 0;
for (SolrServer client : clients) {
val += 10;
@@ -764,7 +764,7 @@ public class BasicDistributedZkTest exte
private void testANewCollectionInOneInstanceWithManualShardAssignement() throws Exception {
log.info("### STARTING testANewCollectionInOneInstanceWithManualShardAssignement");
System.clearProperty("numShards");
- List<SolrServer> collectionClients = new ArrayList<SolrServer>();
+ List<SolrServer> collectionClients = new ArrayList<>();
SolrServer client = clients.get(0);
final String baseUrl = ((HttpSolrServer) client).getBaseURL().substring(
0,
@@ -896,7 +896,7 @@ public class BasicDistributedZkTest exte
private void testANewCollectionInOneInstance() throws Exception {
log.info("### STARTING testANewCollectionInOneInstance");
- List<SolrServer> collectionClients = new ArrayList<SolrServer>();
+ List<SolrServer> collectionClients = new ArrayList<>();
SolrServer client = clients.get(0);
final String baseUrl = ((HttpSolrServer) client).getBaseURL().substring(
0,
@@ -1085,7 +1085,7 @@ public class BasicDistributedZkTest exte
}
private void createNewCollection(final String collection) throws InterruptedException {
- final List<SolrServer> collectionClients = new ArrayList<SolrServer>();
+ final List<SolrServer> collectionClients = new ArrayList<>();
otherCollectionClients.put(collection, collectionClients);
int unique = 0;
for (final SolrServer client : clients) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java Wed Mar 12 14:39:17 2014
@@ -127,7 +127,7 @@ public class ChaosMonkeyNothingIsSafeTes
// as it's not supported for recovery
del("*:*");
- List<StopableThread> threads = new ArrayList<StopableThread>();
+ List<StopableThread> threads = new ArrayList<>();
int threadCount = 1;
int i = 0;
for (i = 0; i < threadCount; i++) {
@@ -247,7 +247,7 @@ public class ChaosMonkeyNothingIsSafeTes
} finally {
client.shutdown();
}
- List<Integer> numShardsNumReplicas = new ArrayList<Integer>(2);
+ List<Integer> numShardsNumReplicas = new ArrayList<>(2);
numShardsNumReplicas.add(1);
numShardsNumReplicas.add(1);
checkForCollection("testcollection",numShardsNumReplicas, null);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java Wed Mar 12 14:39:17 2014
@@ -105,7 +105,7 @@ public class ChaosMonkeySafeLeaderTest e
del("*:*");
- List<StopableIndexingThread> threads = new ArrayList<StopableIndexingThread>();
+ List<StopableIndexingThread> threads = new ArrayList<>();
int threadCount = 2;
for (int i = 0; i < threadCount; i++) {
StopableIndexingThread indexThread = new StopableIndexingThread(controlClient, cloudClient, Integer.toString(i), true);
@@ -169,7 +169,7 @@ public class ChaosMonkeySafeLeaderTest e
} finally {
client.shutdown();
}
- List<Integer> numShardsNumReplicas = new ArrayList<Integer>(2);
+ List<Integer> numShardsNumReplicas = new ArrayList<>(2);
numShardsNumReplicas.add(1);
numShardsNumReplicas.add(1);
checkForCollection("testcollection",numShardsNumReplicas, null);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java Wed Mar 12 14:39:17 2014
@@ -41,14 +41,14 @@ import static org.easymock.EasyMock.expe
public class ClusterStateTest extends SolrTestCaseJ4 {
@Test
public void testStoreAndRead() throws Exception {
- Map<String,DocCollection> collectionStates = new HashMap<String,DocCollection>();
- Set<String> liveNodes = new HashSet<String>();
+ Map<String,DocCollection> collectionStates = new HashMap<>();
+ Set<String> liveNodes = new HashSet<>();
liveNodes.add("node1");
liveNodes.add("node2");
- Map<String,Slice> slices = new HashMap<String,Slice>();
- Map<String,Replica> sliceToProps = new HashMap<String,Replica>();
- Map<String,Object> props = new HashMap<String,Object>();
+ Map<String,Slice> slices = new HashMap<>();
+ Map<String,Replica> sliceToProps = new HashMap<>();
+ Map<String,Object> props = new HashMap<>();
props.put("prop1", "value");
props.put("prop2", "value2");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java Wed Mar 12 14:39:17 2014
@@ -152,7 +152,7 @@ public class ClusterStateUpdateTest exte
System.setProperty("solrcloud.update.delay", "1");
- Map<String,Object> props2 = new HashMap<String,Object>();
+ Map<String,Object> props2 = new HashMap<>();
props2.put("configName", "conf1");
ZkNodeProps zkProps2 = new ZkNodeProps(props2);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java Wed Mar 12 14:39:17 2014
@@ -173,8 +173,8 @@ public class CollectionsAPIDistributedZk
sliceCount = 2;
shardCount = 4;
- completionService = new ExecutorCompletionService<Object>(executor);
- pending = new HashSet<Future<Object>>();
+ completionService = new ExecutorCompletionService<>(executor);
+ pending = new HashSet<>();
checkCreatedVsState = false;
}
@@ -223,7 +223,7 @@ public class CollectionsAPIDistributedZk
String collectionName = "out_of_sync_collection";
- List<Integer> numShardsNumReplicaList = new ArrayList<Integer>();
+ List<Integer> numShardsNumReplicaList = new ArrayList<>();
numShardsNumReplicaList.add(2);
numShardsNumReplicaList.add(1);
@@ -634,12 +634,12 @@ public class CollectionsAPIDistributedZk
request.setPath("/admin/collections");
createNewSolrServer("", baseUrl).request(request);
- List<Integer> numShardsNumReplicaList = new ArrayList<Integer>();
+ List<Integer> numShardsNumReplicaList = new ArrayList<>();
numShardsNumReplicaList.add(2);
numShardsNumReplicaList.add(2);
checkForCollection("nodes_used_collection", numShardsNumReplicaList , null);
- List<String> createNodeList = new ArrayList<String>();
+ List<String> createNodeList = new ArrayList<>();
Set<String> liveNodes = cloudClient.getZkStateReader().getClusterState()
.getLiveNodes();
@@ -677,7 +677,7 @@ public class CollectionsAPIDistributedZk
// env make this pretty fragile
// create new collections rapid fire
- Map<String,List<Integer>> collectionInfos = new HashMap<String,List<Integer>>();
+ Map<String,List<Integer>> collectionInfos = new HashMap<>();
int cnt = random().nextInt(TEST_NIGHTLY ? 6 : 3) + 1;
for (int i = 0; i < cnt; i++) {
@@ -787,7 +787,7 @@ public class CollectionsAPIDistributedZk
checkInstanceDirs(jettys.get(0));
- List<String> collectionNameList = new ArrayList<String>();
+ List<String> collectionNameList = new ArrayList<>();
collectionNameList.addAll(collectionInfos.keySet());
String collectionName = collectionNameList.get(random().nextInt(collectionNameList.size()));
@@ -817,7 +817,7 @@ public class CollectionsAPIDistributedZk
// lets try a collection reload
// get core open times
- Map<String,Long> urlToTimeBefore = new HashMap<String,Long>();
+ Map<String,Long> urlToTimeBefore = new HashMap<>();
collectStartTimes(collectionName, urlToTimeBefore);
assertTrue(urlToTimeBefore.size() > 0);
ModifiableSolrParams params = new ModifiableSolrParams();
@@ -883,7 +883,7 @@ public class CollectionsAPIDistributedZk
request.setPath("/admin/collections");
createNewSolrServer("", baseUrl).request(request);
- List<Integer> list = new ArrayList<Integer> (2);
+ List<Integer> list = new ArrayList<>(2);
list.add(1);
list.add(2);
checkForCollection(collectionName, list, null);
@@ -904,7 +904,7 @@ public class CollectionsAPIDistributedZk
int numShards = (numLiveNodes/2) + 1;
int replicationFactor = 2;
int maxShardsPerNode = 1;
- collectionInfos = new HashMap<String,List<Integer>>();
+ collectionInfos = new HashMap<>();
CloudSolrServer client = createCloudClient("awholynewcollection_" + cnt);
try {
exp = false;
@@ -922,7 +922,7 @@ public class CollectionsAPIDistributedZk
// Test createNodeSet
numLiveNodes = getCommonCloudSolrServer().getZkStateReader().getClusterState().getLiveNodes().size();
- List<String> createNodeList = new ArrayList<String>();
+ List<String> createNodeList = new ArrayList<>();
int numOfCreateNodes = numLiveNodes/2;
assertFalse("createNodeSet test is pointless with only " + numLiveNodes + " nodes running", numOfCreateNodes == 0);
int i = 0;
@@ -937,7 +937,7 @@ public class CollectionsAPIDistributedZk
maxShardsPerNode = 2;
numShards = createNodeList.size() * maxShardsPerNode;
replicationFactor = 1;
- collectionInfos = new HashMap<String,List<Integer>>();
+ collectionInfos = new HashMap<>();
client = createCloudClient("awholynewcollection_" + (cnt+1));
try {
createCollection(collectionInfos, "awholynewcollection_" + (cnt+1), numShards, replicationFactor, maxShardsPerNode, client, StrUtils.join(createNodeList, ','), "conf1");
@@ -965,7 +965,7 @@ public class CollectionsAPIDistributedZk
public void run() {
// create new collections rapid fire
- Map<String,List<Integer>> collectionInfos = new HashMap<String,List<Integer>>();
+ Map<String,List<Integer>> collectionInfos = new HashMap<>();
int cnt = random().nextInt(TEST_NIGHTLY ? 13 : 3) + 1;
for (int i = 0; i < cnt; i++) {
@@ -1012,7 +1012,7 @@ public class CollectionsAPIDistributedZk
}
}
}
- List<Thread> threads = new ArrayList<Thread>();
+ List<Thread> threads = new ArrayList<>();
int numThreads = TEST_NIGHTLY ? 6 : 2;
for (int i = 0; i < numThreads; i++) {
CollectionThread thread = new CollectionThread("collection" + i);
@@ -1054,7 +1054,7 @@ public class CollectionsAPIDistributedZk
boolean allTimesAreCorrect = false;
while (System.currentTimeMillis() < timeoutAt) {
- Map<String,Long> urlToTimeAfter = new HashMap<String,Long>();
+ Map<String,Long> urlToTimeAfter = new HashMap<>();
collectStartTimes(collectionName, urlToTimeAfter);
boolean retry = false;
@@ -1182,13 +1182,13 @@ public class CollectionsAPIDistributedZk
}
private void checkNoTwoShardsUseTheSameIndexDir() throws Exception {
- Map<String, Set<String>> indexDirToShardNamesMap = new HashMap<String, Set<String>>();
+ Map<String, Set<String>> indexDirToShardNamesMap = new HashMap<>();
- List<MBeanServer> servers = new LinkedList<MBeanServer>();
+ List<MBeanServer> servers = new LinkedList<>();
servers.add(ManagementFactory.getPlatformMBeanServer());
servers.addAll(MBeanServerFactory.findMBeanServer(null));
for (final MBeanServer server : servers) {
- Set<ObjectName> mbeans = new HashSet<ObjectName>();
+ Set<ObjectName> mbeans = new HashSet<>();
mbeans.addAll(server.queryNames(null, null));
for (final ObjectName mbean : mbeans) {
Object value;
@@ -1234,7 +1234,7 @@ public class CollectionsAPIDistributedZk
try {
createCollection(collectionName, client,2,2);
String newReplicaName = Assign.assignNode(collectionName , client.getZkStateReader().getClusterState() );
- ArrayList<String> nodeList = new ArrayList<String>(client.getZkStateReader().getClusterState().getLiveNodes());
+ ArrayList<String> nodeList = new ArrayList<>(client.getZkStateReader().getClusterState().getLiveNodes());
Collections.shuffle(nodeList);
Map m = makeMap(
"action", CollectionAction.ADDREPLICA.toString(),
@@ -1311,7 +1311,7 @@ public class CollectionsAPIDistributedZk
REPLICATION_FACTOR, replicationFactor,
MAX_SHARDS_PER_NODE, maxShardsPerNode,
NUM_SLICES, numShards);
- Map<String,List<Integer>> collectionInfos = new HashMap<String,List<Integer>>();
+ Map<String,List<Integer>> collectionInfos = new HashMap<>();
createCollection(collectionInfos, COLL_NAME, props, client,"conf1");
waitForRecoveriesToFinish(COLL_NAME, false);
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java Wed Mar 12 14:39:17 2014
@@ -99,8 +99,8 @@ public class CustomCollectionTest extend
sliceCount = 2;
shardCount = 4;
- completionService = new ExecutorCompletionService<Object>(executor);
- pending = new HashSet<Future<Object>>();
+ completionService = new ExecutorCompletionService<>(executor);
+ pending = new HashSet<>();
checkCreatedVsState = false;
}
@@ -142,7 +142,7 @@ public class CustomCollectionTest extend
// env make this pretty fragile
// create new collections rapid fire
- Map<String,List<Integer>> collectionInfos = new HashMap<String,List<Integer>>();
+ Map<String,List<Integer>> collectionInfos = new HashMap<>();
int replicationFactor = TestUtil.nextInt(random(), 0, 3) + 2;
int cnt = random().nextInt(6) + 1;
@@ -214,7 +214,7 @@ public class CustomCollectionTest extend
assertNull("A shard of a Collection configured with implicit router must have null range",
coll.getSlice("a").getRange());
- List<String> collectionNameList = new ArrayList<String>();
+ List<String> collectionNameList = new ArrayList<>();
collectionNameList.addAll(collectionInfos.keySet());
log.info("Collections created : "+collectionNameList );
@@ -360,7 +360,7 @@ public class CustomCollectionTest extend
int maxShardsPerNode = (((numShards * replicationFactor) / getCommonCloudSolrServer()
.getZkStateReader().getClusterState().getLiveNodes().size())) + 1;
- HashMap<String, List<Integer>> collectionInfos = new HashMap<String, List<Integer>>();
+ HashMap<String, List<Integer>> collectionInfos = new HashMap<>();
CloudSolrServer client = null;
String shard_fld = "shard_s";
try {
@@ -419,7 +419,7 @@ public class CustomCollectionTest extend
private void testCreateShardRepFactor() throws Exception {
String collectionName = "testCreateShardRepFactor";
- HashMap<String, List<Integer>> collectionInfos = new HashMap<String, List<Integer>>();
+ HashMap<String, List<Integer>> collectionInfos = new HashMap<>();
CloudSolrServer client = null;
try {
client = createCloudClient(null);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java Wed Mar 12 14:39:17 2014
@@ -148,7 +148,7 @@ public class DeleteReplicaTest extends A
REPLICATION_FACTOR, replicationFactor,
MAX_SHARDS_PER_NODE, maxShardsPerNode,
NUM_SLICES, numShards);
- Map<String,List<Integer>> collectionInfos = new HashMap<String,List<Integer>>();
+ Map<String,List<Integer>> collectionInfos = new HashMap<>();
createCollection(collectionInfos, COLL_NAME, props, client);
}
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java Wed Mar 12 14:39:17 2014
@@ -145,7 +145,7 @@ public class DeleteShardTest extends Abs
protected void setSliceAsInactive(String slice) throws SolrServerException, IOException,
KeeperException, InterruptedException {
DistributedQueue inQueue = Overseer.getInQueue(cloudClient.getZkStateReader().getZkClient());
- Map<String, Object> propMap = new HashMap<String, Object>();
+ Map<String, Object> propMap = new HashMap<>();
propMap.put(Overseer.QUEUE_OPERATION, "updateshardstate");
propMap.put(slice, Slice.INACTIVE);
propMap.put(ZkStateReader.COLLECTION_PROP, "collection1");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java Wed Mar 12 14:39:17 2014
@@ -523,7 +523,7 @@ public class DistribCursorPagingTest ext
// start with a smallish number of documents, and test that we can do a full walk using a
// sort on *every* field in the schema...
- List<SolrInputDocument> initialDocs = new ArrayList<SolrInputDocument>();
+ List<SolrInputDocument> initialDocs = new ArrayList<>();
for (int i = 1; i <= numInitialDocs; i++) {
SolrInputDocument doc = CursorPagingTest.buildRandomDocument(i);
initialDocs.add(doc);
@@ -606,7 +606,7 @@ public class DistribCursorPagingTest ext
req.setShowSchema(true);
NamedList<Object> rsp = controlClient.request(req);
NamedList<Object> fields = (NamedList) ((NamedList)rsp.get("schema")).get("fields");
- ArrayList<String> names = new ArrayList<String>(fields.size());
+ ArrayList<String> names = new ArrayList<>(fields.size());
for (Map.Entry<String,Object> item : fields) {
names.add(item.getKey());
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java Wed Mar 12 14:39:17 2014
@@ -387,7 +387,7 @@ public class FullSolrCloudDistribCmdsTes
}
}
};
- List<Thread> threads = new ArrayList<Thread>();
+ List<Thread> threads = new ArrayList<>();
int nthreads = random().nextInt(TEST_NIGHTLY ? 4 : 2) + 1;
for (int i = 0; i < nthreads; i++) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java Wed Mar 12 14:39:17 2014
@@ -57,9 +57,9 @@ public class LeaderElectionIntegrationTe
protected String zkDir;
- private Map<Integer,CoreContainer> containerMap = new HashMap<Integer,CoreContainer>();
+ private Map<Integer,CoreContainer> containerMap = new HashMap<>();
- private Map<String,Set<Integer>> shardPorts = new HashMap<String,Set<Integer>>();
+ private Map<String,Set<Integer>> shardPorts = new HashMap<>();
private SolrZkClient zkClient;
@@ -142,7 +142,7 @@ public class LeaderElectionIntegrationTe
System.setProperty("solr.solr.home", TEST_HOME());
Set<Integer> ports = shardPorts.get(shard);
if (ports == null) {
- ports = new HashSet<Integer>();
+ ports = new HashSet<>();
shardPorts.put(shard, ports);
}
ports.add(port);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java Wed Mar 12 14:39:17 2014
@@ -228,7 +228,7 @@ public class LeaderElectionTest extends
@Test
public void testElection() throws Exception {
- List<ClientThread> threads = new ArrayList<ClientThread>();
+ List<ClientThread> threads = new ArrayList<>();
for (int i = 0; i < 15; i++) {
ClientThread thread = new ClientThread(i);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java Wed Mar 12 14:39:17 2014
@@ -141,7 +141,7 @@ public class MigrateRouteKeyTest extends
}
private void createCollection(String targetCollection) throws Exception {
- HashMap<String, List<Integer>> collectionInfos = new HashMap<String, List<Integer>>();
+ HashMap<String, List<Integer>> collectionInfos = new HashMap<>();
CloudSolrServer client = null;
try {
client = createCloudClient(null);
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=1576755&r1=1576754&r2=1576755&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 Wed Mar 12 14:39:17 2014
@@ -81,7 +81,7 @@ public class OverseerCollectionProcessor
private OverseerCollectionProcessorToBeTested underTest;
private Thread thread;
- private Queue<QueueEvent> queue = new BlockingArrayQueue<QueueEvent>();
+ private Queue<QueueEvent> queue = new BlockingArrayQueue<>();
private class OverseerCollectionProcessorToBeTested extends
OverseerCollectionProcessor {
@@ -202,7 +202,7 @@ public class OverseerCollectionProcessor
return collectionsSet;
}
}).anyTimes();
- final Set<String> liveNodes = new HashSet<String>();
+ final Set<String> liveNodes = new HashSet<>();
for (int i = 0; i < liveNodesCount; i++) {
final String address = "localhost:" + (8963 + i) + "_solr";
liveNodes.add(address);
@@ -316,14 +316,14 @@ public class OverseerCollectionProcessor
}
private class SubmitCapture {
- public Capture<ShardRequest> shardRequestCapture = new Capture<ShardRequest>();
- public Capture<String> nodeUrlsWithoutProtocolPartCapture = new Capture<String>();
- public Capture<ModifiableSolrParams> params = new Capture<ModifiableSolrParams>();
+ public Capture<ShardRequest> shardRequestCapture = new Capture<>();
+ public Capture<String> nodeUrlsWithoutProtocolPartCapture = new Capture<>();
+ public Capture<ModifiableSolrParams> params = new Capture<>();
}
protected List<SubmitCapture> mockShardHandlerForCreateJob(
Integer numberOfSlices, Integer numberOfReplica) {
- List<SubmitCapture> submitCaptures = new ArrayList<SubmitCapture>();
+ List<SubmitCapture> submitCaptures = new ArrayList<>();
for (int i = 0; i < (numberOfSlices * numberOfReplica); i++) {
SubmitCapture submitCapture = new SubmitCapture();
shardHandlerMock.submit(capture(submitCapture.shardRequestCapture),
@@ -370,9 +370,9 @@ public class OverseerCollectionProcessor
protected void verifySubmitCaptures(List<SubmitCapture> submitCaptures,
Integer numberOfSlices, Integer numberOfReplica, Collection<String> createNodes) {
- List<String> coreNames = new ArrayList<String>();
- Map<String,Map<String,Integer>> sliceToNodeUrlsWithoutProtocolPartToNumberOfShardsRunningMapMap = new HashMap<String,Map<String,Integer>>();
- List<String> nodeUrlWithoutProtocolPartForLiveNodes = new ArrayList<String>(
+ List<String> coreNames = new ArrayList<>();
+ Map<String,Map<String,Integer>> sliceToNodeUrlsWithoutProtocolPartToNumberOfShardsRunningMapMap = new HashMap<>();
+ List<String> nodeUrlWithoutProtocolPartForLiveNodes = new ArrayList<>(
createNodes.size());
for (String nodeName : createNodes) {
String nodeUrlWithoutProtocolPart = nodeName.replaceAll("_", "/");
@@ -510,7 +510,7 @@ public class OverseerCollectionProcessor
assertTrue("Wrong usage of testTemplage. createNodeListOption has to be " + CreateNodeListOptions.SEND + " when numberOfNodes and numberOfNodesToCreateOn are unequal", ((createNodeListOption == CreateNodeListOptions.SEND) || (numberOfNodes.intValue() == numberOfNodesToCreateOn.intValue())));
Set<String> liveNodes = commonMocks(numberOfNodes);
- List<String> createNodeList = new ArrayList<String>();
+ List<String> createNodeList = new ArrayList<>();
int i = 0;
for (String node : liveNodes) {
if (i++ < numberOfNodesToCreateOn) {
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=1576755&r1=1576754&r2=1576755&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 Wed Mar 12 14:39:17 2014
@@ -216,7 +216,7 @@ public class OverseerRolesTest extends
REPLICATION_FACTOR, replicationFactor,
MAX_SHARDS_PER_NODE, maxShardsPerNode,
NUM_SLICES, numShards);
- Map<String,List<Integer>> collectionInfos = new HashMap<String,List<Integer>>();
+ Map<String,List<Integer>> collectionInfos = new HashMap<>();
createCollection(collectionInfos, COLL_NAME, props, client);
}
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=1576755&r1=1576754&r2=1576755&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 Wed Mar 12 14:39:17 2014
@@ -61,8 +61,8 @@ public class OverseerTest extends SolrTe
static final int TIMEOUT = 10000;
private static final boolean DEBUG = false;
- private List<Overseer> overseers = new ArrayList<Overseer>();
- private List<ZkStateReader> readers = new ArrayList<ZkStateReader>();
+ private List<Overseer> overseers = new ArrayList<>();
+ private List<ZkStateReader> readers = new ArrayList<>();
private String collection = "collection1";
@@ -435,7 +435,7 @@ public class OverseerTest extends SolrTe
assertEquals("Unable to verify all cores have been returned an id",
coreCount, assignedCount);
- final HashMap<String, AtomicInteger> counters = new HashMap<String,AtomicInteger>();
+ final HashMap<String, AtomicInteger> counters = new HashMap<>();
for (int i = 1; i < sliceCount+1; i++) {
counters.put("shard" + i, new AtomicInteger());
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java Wed Mar 12 14:39:17 2014
@@ -49,7 +49,7 @@ public class RemoteQueryErrorTest extend
createCollection("collection2", 2, 1, 10);
- List<Integer> numShardsNumReplicaList = new ArrayList<Integer>(2);
+ List<Integer> numShardsNumReplicaList = new ArrayList<>(2);
numShardsNumReplicaList.add(2);
numShardsNumReplicaList.add(1);
checkForCollection("collection2", numShardsNumReplicaList, null);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java Wed Mar 12 14:39:17 2014
@@ -341,10 +341,10 @@ public class ShardRoutingTest extends Ab
// TODO: refactor some of this stuff up into a base class for use by other tests
void doQuery(String expectedDocs, String... queryParams) throws Exception {
- Set<String> expectedIds = new HashSet<String>( StrUtils.splitSmart(expectedDocs, ",", true) );
+ Set<String> expectedIds = new HashSet<>( StrUtils.splitSmart(expectedDocs, ",", true) );
QueryResponse rsp = cloudClient.query(params(queryParams));
- Set<String> obtainedIds = new HashSet<String>();
+ Set<String> obtainedIds = new HashSet<>();
for (SolrDocument doc : rsp.getResults()) {
obtainedIds.add((String) doc.get("id"));
}
@@ -355,10 +355,10 @@ public class ShardRoutingTest extends Ab
void doRTG(String ids) throws Exception {
cloudClient.query(params("qt","/get", "ids",ids));
- Set<String> expectedIds = new HashSet<String>( StrUtils.splitSmart(ids, ",", true) );
+ Set<String> expectedIds = new HashSet<>( StrUtils.splitSmart(ids, ",", true) );
QueryResponse rsp = cloudClient.query(params("qt","/get", "ids",ids));
- Set<String> obtainedIds = new HashSet<String>();
+ Set<String> obtainedIds = new HashSet<>();
for (SolrDocument doc : rsp.getResults()) {
obtainedIds.add((String) doc.get("id"));
}
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=1576755&r1=1576754&r2=1576755&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 Wed Mar 12 14:39:17 2014
@@ -115,7 +115,7 @@ public class ShardSplitTest extends Basi
Slice shard1 = clusterState.getSlice(AbstractDistribZkTestBase.DEFAULT_COLLECTION, SHARD1);
DocRouter.Range shard1Range = shard1.getRange() != null ? shard1.getRange() : router.fullRange();
- List<DocRouter.Range> subRanges = new ArrayList<DocRouter.Range>();
+ List<DocRouter.Range> subRanges = new ArrayList<>();
List<DocRouter.Range> ranges = router.partitionRange(4, shard1Range);
// test with only one range
@@ -158,7 +158,7 @@ public class ShardSplitTest extends Basi
final DocRouter router = clusterState.getCollection(AbstractDistribZkTestBase.DEFAULT_COLLECTION).getRouter();
Slice shard1 = clusterState.getSlice(AbstractDistribZkTestBase.DEFAULT_COLLECTION, SHARD1);
DocRouter.Range shard1Range = shard1.getRange() != null ? shard1.getRange() : router.fullRange();
- List<DocRouter.Range> subRanges = new ArrayList<DocRouter.Range>();
+ List<DocRouter.Range> subRanges = new ArrayList<>();
if (usually()) {
List<DocRouter.Range> ranges = router.partitionRange(4, shard1Range);
// 75% of range goes to shard1_0 and the rest to shard1_1
@@ -185,7 +185,7 @@ public class ShardSplitTest extends Basi
int max = atLeast(random, 401);
int sleep = atLeast(random, 25);
log.info("SHARDSPLITTEST: Going to add " + max + " number of docs at 1 doc per " + sleep + "ms");
- Set<String> deleted = new HashSet<String>();
+ Set<String> deleted = new HashSet<>();
for (int id = 101; id < max; id++) {
try {
indexAndUpdateCount(router, ranges, docCounts, String.valueOf(id), id);
@@ -246,7 +246,7 @@ public class ShardSplitTest extends Basi
int maxShardsPerNode = (((numShards * replicationFactor) / getCommonCloudSolrServer()
.getZkStateReader().getClusterState().getLiveNodes().size())) + 1;
- HashMap<String, List<Integer>> collectionInfos = new HashMap<String, List<Integer>>();
+ HashMap<String, List<Integer>> collectionInfos = new HashMap<>();
CloudSolrServer client = null;
String shard_fld = "shard_s";
try {
@@ -324,7 +324,7 @@ public class ShardSplitTest extends Basi
int maxShardsPerNode = (((numShards * replicationFactor) / getCommonCloudSolrServer()
.getZkStateReader().getClusterState().getLiveNodes().size())) + 1;
- HashMap<String, List<Integer>> collectionInfos = new HashMap<String, List<Integer>>();
+ HashMap<String, List<Integer>> collectionInfos = new HashMap<>();
CloudSolrServer client = null;
try {
client = createCloudClient(null);
@@ -566,9 +566,9 @@ public class ShardSplitTest extends Basi
log.info("Actual docCount for shard1_0 = {}", shard10Count);
log.info("Actual docCount for shard1_1 = {}", shard11Count);
- Map<String, String> idVsVersion = new HashMap<String, String>();
- Map<String, SolrDocument> shard10Docs = new HashMap<String, SolrDocument>();
- Map<String, SolrDocument> shard11Docs = new HashMap<String, SolrDocument>();
+ Map<String, String> idVsVersion = new HashMap<>();
+ Map<String, SolrDocument> shard10Docs = new HashMap<>();
+ Map<String, SolrDocument> shard11Docs = new HashMap<>();
for (int i = 0; i < response.getResults().size(); i++) {
SolrDocument document = response.getResults().get(i);
idVsVersion.put(document.getFieldValue("id").toString(), document.getFieldValue("_version_").toString());
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=1576755&r1=1576754&r2=1576755&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 Wed Mar 12 14:39:17 2014
@@ -34,13 +34,13 @@ import java.util.Set;
public class SliceStateTest extends SolrTestCaseJ4 {
@Test
public void testDefaultSliceState() throws Exception {
- Map<String, DocCollection> collectionStates = new HashMap<String, DocCollection>();
- Set<String> liveNodes = new HashSet<String>();
+ Map<String, DocCollection> collectionStates = new HashMap<>();
+ Set<String> liveNodes = new HashSet<>();
liveNodes.add("node1");
- Map<String, Slice> slices = new HashMap<String, Slice>();
- Map<String, Replica> sliceToProps = new HashMap<String, Replica>();
- Map<String, Object> props = new HashMap<String, Object>();
+ Map<String, Slice> slices = new HashMap<>();
+ Map<String, Replica> sliceToProps = new HashMap<>();
+ Map<String, Object> props = new HashMap<>();
Replica replica = new Replica("node1", props);
sliceToProps.put("node1", replica);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java Wed Mar 12 14:39:17 2014
@@ -86,7 +86,7 @@ public class SliceStateUpdateTest extend
.getZkAddress(), "solrconfig.xml", "schema.xml");
log.info("####SETUP_START " + getTestName());
- Map<String, Object> props2 = new HashMap<String, Object>();
+ Map<String, Object> props2 = new HashMap<>();
props2.put("configName", "conf1");
ZkNodeProps zkProps2 = new ZkNodeProps(props2);
@@ -147,7 +147,7 @@ public class SliceStateUpdateTest extend
// new LinkedHashMap<String, DocCollection>(clusterState.getCollectionStates());
Map<String, Slice> slicesMap = clusterState.getSlicesMap("collection1");
- Map<String, Object> props = new HashMap<String, Object>(1);
+ Map<String, Object> props = new HashMap<>(1);
Slice slice = slicesMap.get("shard1");
Map<String, Object> prop = slice.getProperties();
prop.put("state", "inactive");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java Wed Mar 12 14:39:17 2014
@@ -96,7 +96,7 @@ public class SyncSliceTest extends Abstr
waitForThingsToLevelOut(30);
del("*:*");
- List<CloudJettyRunner> skipServers = new ArrayList<CloudJettyRunner>();
+ List<CloudJettyRunner> skipServers = new ArrayList<>();
int docId = 0;
indexDoc(skipServers, id, docId++, i1, 50, tlong, 50, t1,
"to come to the aid of their country.");
@@ -156,7 +156,7 @@ public class SyncSliceTest extends Abstr
"to come to the aid of their country.");
- Set<CloudJettyRunner> jetties = new HashSet<CloudJettyRunner>();
+ Set<CloudJettyRunner> jetties = new HashSet<>();
jetties.addAll(shardToJetty.get("shard1"));
jetties.remove(leaderJetty);
assertEquals(shardCount - 1, jetties.size());
@@ -217,7 +217,7 @@ public class SyncSliceTest extends Abstr
"Test Setup Failure: shard1 should have just been set up to be inconsistent - but it's still consistent. Leader:"
+ leaderJetty.url + " Dead Guy:" + deadJetty.url + "skip list:" + skipServers, shardFailMessage);
- jetties = new HashSet<CloudJettyRunner>();
+ jetties = new HashSet<>();
jetties.addAll(shardToJetty.get("shard1"));
jetties.remove(leaderJetty);
assertEquals(shardCount - 1, jetties.size());
@@ -292,8 +292,8 @@ public class SyncSliceTest extends Abstr
}
private List<CloudJettyRunner> getRandomOtherJetty(CloudJettyRunner leader, CloudJettyRunner down) {
- List<CloudJettyRunner> skipServers = new ArrayList<CloudJettyRunner>();
- List<CloudJettyRunner> candidates = new ArrayList<CloudJettyRunner>();
+ List<CloudJettyRunner> skipServers = new ArrayList<>();
+ List<CloudJettyRunner> candidates = new ArrayList<>();
candidates.addAll(shardToJetty.get("shard1"));
if (leader != null) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java Wed Mar 12 14:39:17 2014
@@ -290,7 +290,7 @@ public class TestDistribDocBasedVersion
void doQuery(String expectedDocs, String... queryParams) throws Exception {
List<String> strs = StrUtils.splitSmart(expectedDocs, ",", true);
- Map<String, Object> expectedIds = new HashMap<String,Object>();
+ Map<String, Object> expectedIds = new HashMap<>();
for (int i=0; i<strs.size(); i+=2) {
String id = strs.get(i);
String vS = strs.get(i+1);
@@ -299,7 +299,7 @@ public class TestDistribDocBasedVersion
}
QueryResponse rsp = cloudClient.query(params(queryParams));
- Map<String, Object> obtainedIds = new HashMap<String,Object>();
+ Map<String, Object> obtainedIds = new HashMap<>();
for (SolrDocument doc : rsp.getResults()) {
obtainedIds.put((String) doc.get("id"), doc.get(vfield));
}
@@ -309,7 +309,7 @@ public class TestDistribDocBasedVersion
void doRTG(String ids, String versions) throws Exception {
- Map<String, Object> expectedIds = new HashMap<String,Object>();
+ Map<String, Object> expectedIds = new HashMap<>();
List<String> strs = StrUtils.splitSmart(ids, ",", true);
List<String> verS = StrUtils.splitSmart(versions, ",", true);
for (int i=0; i<strs.size(); i++) {
@@ -319,7 +319,7 @@ public class TestDistribDocBasedVersion
ss.query(params("qt","/get", "ids",ids));
QueryResponse rsp = cloudClient.query(params("qt","/get", "ids",ids));
- Map<String, Object> obtainedIds = new HashMap<String,Object>();
+ Map<String, Object> obtainedIds = new HashMap<>();
for (SolrDocument doc : rsp.getResults()) {
obtainedIds.put((String) doc.get("id"), doc.get(vfield));
}
@@ -330,10 +330,10 @@ public class TestDistribDocBasedVersion
void doRTG(String ids) throws Exception {
ss.query(params("qt","/get", "ids",ids));
- Set<String> expectedIds = new HashSet<String>( StrUtils.splitSmart(ids, ",", true) );
+ Set<String> expectedIds = new HashSet<>( StrUtils.splitSmart(ids, ",", true) );
QueryResponse rsp = cloudClient.query(params("qt","/get", "ids",ids));
- Set<String> obtainedIds = new HashSet<String>();
+ Set<String> obtainedIds = new HashSet<>();
for (SolrDocument doc : rsp.getResults()) {
obtainedIds.add((String) doc.get("id"));
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestHashPartitioner.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestHashPartitioner.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestHashPartitioner.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestHashPartitioner.java Wed Mar 12 14:39:17 2014
@@ -146,8 +146,8 @@ public class TestHashPartitioner extends
List<String> expectedShardStr = StrUtils.splitSmart(expectedShards, ",", true);
- HashSet<String> expectedSet = new HashSet<String>(expectedShardStr);
- HashSet<String> obtainedSet = new HashSet<String>();
+ HashSet<String> expectedSet = new HashSet<>(expectedShardStr);
+ HashSet<String> obtainedSet = new HashSet<>();
for (Slice slice : slices) {
obtainedSet.add(slice.getName());
}
@@ -222,7 +222,7 @@ public class TestHashPartitioner extends
DocCollection createCollection(int nSlices, DocRouter router) {
List<Range> ranges = router.partitionRange(nSlices, router.fullRange());
- Map<String,Slice> slices = new HashMap<String,Slice>();
+ Map<String,Slice> slices = new HashMap<>();
for (int i=0; i<ranges.size(); i++) {
Range range = ranges.get(i);
Slice slice = new Slice("shard"+(i+1), null, map("range",range));
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java Wed Mar 12 14:39:17 2014
@@ -90,7 +90,7 @@ public class TriLevelCompositeIdRoutingT
commit();
- HashMap<String, Integer> idMap = new HashMap<String, Integer>();
+ HashMap<String, Integer> idMap = new HashMap<>();
for (int i = 1; i <= sliceCount; i++) {
@@ -122,7 +122,7 @@ public class TriLevelCompositeIdRoutingT
commit();
- HashMap<String, Integer> idMap = new HashMap<String, Integer>();
+ HashMap<String, Integer> idMap = new HashMap<>();
for (int i = 1; i <= sliceCount; i++) {
@@ -142,7 +142,7 @@ public class TriLevelCompositeIdRoutingT
Set<String> doQueryGetUniqueIdKeys(String... queryParams) throws Exception {
QueryResponse rsp = cloudClient.query(params(queryParams));
- Set<String> obtainedIdKeys = new HashSet<String>();
+ Set<String> obtainedIdKeys = new HashSet<>();
for (SolrDocument doc : rsp.getResults()) {
obtainedIdKeys.add(getKey((String) doc.get("id")));
}
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=1576755&r1=1576754&r2=1576755&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 Wed Mar 12 14:39:17 2014
@@ -175,7 +175,7 @@ public class ZkControllerTest extends So
zkClient.makePath(ZkController.CONFIGS_ZKNODE + "/" + actualConfigName, true);
- Map<String,Object> props = new HashMap<String,Object>();
+ Map<String,Object> props = new HashMap<>();
props.put("configName", actualConfigName);
ZkNodeProps zkProps = new ZkNodeProps(props);
zkClient.makePath(ZkStateReader.COLLECTIONS_ZKNODE + "/"
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=1576755&r1=1576754&r2=1576755&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 Wed Mar 12 14:39:17 2014
@@ -30,7 +30,7 @@ public class ZkNodePropsTest extends Sol
@Test
public void testBasic() throws IOException {
- Map<String,Object> props = new HashMap<String,Object>();
+ Map<String,Object> props = new HashMap<>();
props.put("prop1", "value1");
props.put("prop2", "value2");
props.put("prop3", "value3");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java Wed Mar 12 14:39:17 2014
@@ -36,7 +36,7 @@ public class HdfsTestUtil {
private static Locale savedLocale;
- private static Map<MiniDFSCluster,Timer> timers = new ConcurrentHashMap<MiniDFSCluster,Timer>();
+ private static Map<MiniDFSCluster,Timer> timers = new ConcurrentHashMap<>();
public static MiniDFSCluster setupClass(String dataDir) throws Exception {
LuceneTestCase.assumeFalse("HDFS tests were disabled by -Dtests.disableHdfs",
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java Wed Mar 12 14:39:17 2014
@@ -98,8 +98,8 @@ public class HdfsWriteToMultipleCollecti
for (int i = 0; i < cnt; i++) {
waitForRecoveriesToFinish(ACOLLECTION + i, false);
}
- List<CloudSolrServer> cloudServers = new ArrayList<CloudSolrServer>();
- List<StopableIndexingThread> threads = new ArrayList<StopableIndexingThread>();
+ List<CloudSolrServer> cloudServers = new ArrayList<>();
+ List<StopableIndexingThread> threads = new ArrayList<>();
for (int i = 0; i < cnt; i++) {
CloudSolrServer server = new CloudSolrServer(zkServer.getZkAddress());
server.setDefaultCollection(ACOLLECTION + i);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java Wed Mar 12 14:39:17 2014
@@ -155,7 +155,7 @@ public class StressHdfsTest extends Basi
}
// collect the data dirs
- List<String> dataDirs = new ArrayList<String>();
+ List<String> dataDirs = new ArrayList<>();
int i = 0;
for (SolrServer client : clients) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java Wed Mar 12 14:39:17 2014
@@ -33,7 +33,7 @@ import org.junit.Test;
*/
public class CachingDirectoryFactoryTest extends SolrTestCaseJ4 {
- private Map<String,Tracker> dirs = new HashMap<String,Tracker>();
+ private Map<String,Tracker> dirs = new HashMap<>();
private volatile boolean stop = false;
private class Tracker {
@@ -46,7 +46,7 @@ public class CachingDirectoryFactoryTest
public void stressTest() throws Exception {
final CachingDirectoryFactory df = new RAMDirectoryFactory();
- List<Thread> threads = new ArrayList<Thread>();
+ List<Thread> threads = new ArrayList<>();
int threadCount = 11;
for (int i = 0; i < threadCount; i++) {
Thread getDirThread = new GetDirThread(df);
@@ -126,7 +126,7 @@ public class CachingDirectoryFactoryTest
synchronized (dirs) {
int sz = dirs.size();
- List<Tracker> dirsList = new ArrayList<Tracker>();
+ List<Tracker> dirsList = new ArrayList<>();
dirsList.addAll(dirs.values());
if (sz > 0) {
Tracker tracker = dirsList.get(Math.min(dirsList.size() - 1,
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java Wed Mar 12 14:39:17 2014
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.Atomi
public class CountUsageValueSourceParser extends ValueSourceParser {
private static final ConcurrentMap<String,AtomicInteger> counters
- = new ConcurrentHashMap<String,AtomicInteger>();
+ = new ConcurrentHashMap<>();
public static void clearCounters() {
counters.clear();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java Wed Mar 12 14:39:17 2014
@@ -69,8 +69,8 @@ public class OpenCloseCoreStressTest ext
File solrHomeDirectory;
- List<HttpSolrServer> indexingServers = new ArrayList<HttpSolrServer>(indexingThreads);
- List<HttpSolrServer> queryServers = new ArrayList<HttpSolrServer>(queryThreads);
+ List<HttpSolrServer> indexingServers = new ArrayList<>(indexingThreads);
+ List<HttpSolrServer> queryServers = new ArrayList<>(queryThreads);
static String savedFactory;
@@ -81,8 +81,8 @@ public class OpenCloseCoreStressTest ext
@Before
public void setupServer() throws Exception {
- coreCounts = new TreeMap<String, Long>();
- coreNames = new ArrayList<String>();
+ coreCounts = new TreeMap<>();
+ coreNames = new ArrayList<>();
cumulativeDocs = 0;
solrHomeDirectory = new File(TEMP_DIR, "OpenCloseCoreStressTest_");
@@ -328,7 +328,7 @@ class Indexer {
static volatile int lastCount;
static volatile long nextTime;
- ArrayList<OneIndexer> _threads = new ArrayList<OneIndexer>();
+ ArrayList<OneIndexer> _threads = new ArrayList<>();
public Indexer(OpenCloseCoreStressTest OCCST, String url, List<HttpSolrServer> servers, int numThreads, int secondsToRun, Random random) {
stopTime = System.currentTimeMillis() + (secondsToRun * 1000);
@@ -436,7 +436,7 @@ class OneIndexer extends Thread {
class Queries {
static AtomicBoolean _keepon = new AtomicBoolean(true);
- List<Thread> _threads = new ArrayList<Thread>();
+ List<Thread> _threads = new ArrayList<>();
static AtomicInteger _errors = new AtomicInteger(0);
String baseUrl;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java Wed Mar 12 14:39:17 2014
@@ -178,7 +178,7 @@ public class QueryResultKeyTest extends
* specified ints
*/
private List<Query> buildFiltersFromNumbers(int[] values) {
- ArrayList<Query> filters = new ArrayList<Query>(values.length);
+ ArrayList<Query> filters = new ArrayList<>(values.length);
for (int val : values) {
filters.add(new FlatHashTermQuery(String.valueOf(val)));
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java Wed Mar 12 14:39:17 2014
@@ -172,7 +172,7 @@ public class SolrCoreTest extends SolrTe
final int LOOP = 100;
final int MT = 16;
ExecutorService service = Executors.newFixedThreadPool(MT, new DefaultSolrThreadFactory("refCountMT"));
- List<Callable<Integer>> callees = new ArrayList<Callable<Integer>>(MT);
+ List<Callable<Integer>> callees = new ArrayList<>(MT);
final CoreContainer cores = h.getCoreContainer();
for (int i = 0; i < MT; ++i) {
Callable<Integer> call = new Callable<Integer>() {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java Wed Mar 12 14:39:17 2014
@@ -130,7 +130,7 @@ public class TestCoreContainer extends S
}
}
- List<Thread> threads = new ArrayList<Thread>();
+ List<Thread> threads = new ArrayList<>();
int numThreads = 4;
for (int i = 0; i < numThreads; i++) {
threads.add(new TestThread());
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java Wed Mar 12 14:39:17 2014
@@ -178,7 +178,7 @@ public class TestJmxIntegration extends
private ObjectName getObjectName(String key, SolrInfoMBean infoBean)
throws MalformedObjectNameException {
- Hashtable<String, String> map = new Hashtable<String, String>();
+ Hashtable<String, String> map = new Hashtable<>();
map.put("type", key);
map.put("id", infoBean.getName());
String coreName = h.getCore().getName();