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 19:14:27 UTC
svn commit: r1576837 [27/29] - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/
lucene/analysis/co...
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java Wed Mar 12 18:14:05 2014
@@ -240,7 +240,7 @@ public class ParsingFieldUpdateProcessor
IndexSchema schema = h.getCore().getLatestSchema();
assertNull(schema.getFieldOrNull("not_in_schema"));
DateTimeFormatter dateTimeFormatter = ISODateTimeFormat.dateOptionalTimeParser().withZoneUTC();
- Map<Object,Object> mixed = new HashMap<Object,Object>();
+ Map<Object,Object> mixed = new HashMap<>();
String[] dateStrings = { "2020-05-13T18:47", "1989-12-14", "1682-07-22T18:33:00.000Z" };
for (String dateString : dateStrings) {
mixed.put(dateTimeFormatter.parseDateTime(dateString).toDate(), dateString);
@@ -339,7 +339,7 @@ public class ParsingFieldUpdateProcessor
public void testFailedParseMixedInt() throws Exception {
IndexSchema schema = h.getCore().getLatestSchema();
assertNull(schema.getFieldOrNull("not_in_schema"));
- Map<Object,Object> mixed = new HashMap<Object,Object>();
+ Map<Object,Object> mixed = new HashMap<>();
Float floatVal = 294423.0f;
mixed.put(85, "85");
mixed.put(floatVal, floatVal); // Float-typed field value
@@ -422,7 +422,7 @@ public class ParsingFieldUpdateProcessor
public void testFailedParseMixedLong() throws Exception {
IndexSchema schema = h.getCore().getLatestSchema();
assertNull(schema.getFieldOrNull("not_in_schema"));
- Map<Object,Object> mixed = new HashMap<Object,Object>();
+ Map<Object,Object> mixed = new HashMap<>();
Float floatVal = 294423.0f;
mixed.put(85L, "85");
mixed.put(floatVal, floatVal); // Float-typed field value
@@ -506,7 +506,7 @@ public class ParsingFieldUpdateProcessor
public void testMixedFloats() throws Exception {
IndexSchema schema = h.getCore().getLatestSchema();
assertNotNull(schema.getFieldOrNull("float_tf")); // should match dynamic field "*_tf"
- Map<Float,Object> mixedFloats = new HashMap<Float,Object>();
+ Map<Float,Object> mixedFloats = new HashMap<>();
mixedFloats.put(85.0f, "85");
mixedFloats.put(2894518.0f, "2,894,518");
mixedFloats.put(2.94423E-9f, 2.94423E-9f); // Float-typed field value
@@ -524,7 +524,7 @@ public class ParsingFieldUpdateProcessor
public void testFailedParseMixedFloat() throws Exception {
IndexSchema schema = h.getCore().getLatestSchema();
assertNull(schema.getFieldOrNull("not_in_schema"));
- Map<Object,Object> mixed = new HashMap<Object,Object>();
+ Map<Object,Object> mixed = new HashMap<>();
Long longVal = 294423L;
mixed.put(85L, "85");
mixed.put(longVal, longVal); // Float-typed field value
@@ -608,7 +608,7 @@ public class ParsingFieldUpdateProcessor
public void testFailedParseMixedDouble() throws Exception {
IndexSchema schema = h.getCore().getLatestSchema();
assertNull(schema.getFieldOrNull("not_in_schema"));
- Map<Object,Object> mixed = new HashMap<Object,Object>();
+ Map<Object,Object> mixed = new HashMap<>();
Long longVal = 294423L;
mixed.put(85, "85.0");
mixed.put(longVal, longVal); // Float-typed field value
@@ -710,7 +710,7 @@ public class ParsingFieldUpdateProcessor
public void testFailedParseMixedBoolean() throws Exception {
IndexSchema schema = h.getCore().getLatestSchema();
assertNull(schema.getFieldOrNull("not_in_schema"));
- Map<Object,Object> mixed = new HashMap<Object,Object>();
+ Map<Object,Object> mixed = new HashMap<>();
Long longVal = 294423L;
mixed.put(true, "true");
mixed.put(longVal, longVal); // Float-typed field value
@@ -739,7 +739,7 @@ public class ParsingFieldUpdateProcessor
SolrInputDocument d = null;
String chain = "cascading-parsers-no-run-processor";
- Map<Boolean,String> booleans = new HashMap<Boolean,String>();
+ Map<Boolean,String> booleans = new HashMap<>();
booleans.put(true, "truE");
booleans.put(false, "False");
d = processAdd(chain, doc(f("id", "341"), f(fieldName, booleans.values())));
@@ -750,7 +750,7 @@ public class ParsingFieldUpdateProcessor
}
assertTrue(booleans.isEmpty());
- Map<Integer,String> ints = new HashMap<Integer,String>();
+ Map<Integer,String> ints = new HashMap<>();
ints.put(2, "2");
ints.put(50928, "50928");
ints.put(86942008, "86,942,008");
@@ -762,7 +762,7 @@ public class ParsingFieldUpdateProcessor
}
assertTrue(ints.isEmpty());
- Map<Long,String> longs = new HashMap<Long,String>();
+ Map<Long,String> longs = new HashMap<>();
longs.put(2L, "2");
longs.put(50928L, "50928");
longs.put(86942008987654L, "86,942,008,987,654");
@@ -789,7 +789,7 @@ public class ParsingFieldUpdateProcessor
}
*/
- Map<Double,String> doubles = new HashMap<Double,String>();
+ Map<Double,String> doubles = new HashMap<>();
doubles.put(2.0, "2.");
doubles.put(509.28, "509.28");
doubles.put(86942.008, "86,942.008");
@@ -801,7 +801,7 @@ public class ParsingFieldUpdateProcessor
}
DateTimeFormatter dateTimeFormatter = ISODateTimeFormat.dateOptionalTimeParser().withZoneUTC();
- Map<Date,String> dates = new HashMap<Date,String>();
+ Map<Date,String> dates = new HashMap<>();
String[] dateStrings = { "2020-05-13T18:47", "1989-12-14", "1682-07-22T18:33:00.000Z" };
for (String dateString : dateStrings) {
dates.put(dateTimeFormatter.parseDateTime(dateString).toDate(), dateString);
@@ -814,7 +814,7 @@ public class ParsingFieldUpdateProcessor
}
assertTrue(dates.isEmpty());
- Map<Double,String> mixedLongsAndDoubles = new LinkedHashMap<Double,String>(); // preserve order
+ Map<Double,String> mixedLongsAndDoubles = new LinkedHashMap<>(); // preserve order
mixedLongsAndDoubles.put(85.0, "85");
mixedLongsAndDoubles.put(2.94423E-9, "2.94423E-9");
mixedLongsAndDoubles.put(2894518.0, "2,894,518");
@@ -827,7 +827,7 @@ public class ParsingFieldUpdateProcessor
}
assertTrue(mixedLongsAndDoubles.isEmpty());
- Set<String> mixed = new HashSet<String>();
+ Set<String> mixed = new HashSet<>();
mixed.add("true");
mixed.add("1682-07-22T18:33:00.000Z");
mixed.add("2,894,518");
@@ -839,7 +839,7 @@ public class ParsingFieldUpdateProcessor
assertTrue(o instanceof String);
}
- Map<Double,Object> mixedDoubles = new LinkedHashMap<Double,Object>(); // preserve order
+ Map<Double,Object> mixedDoubles = new LinkedHashMap<>(); // preserve order
mixedDoubles.put(85.0, "85");
mixedDoubles.put(2.94423E-9, 2.94423E-9); // Double-typed field value
mixedDoubles.put(2894518.0, "2,894,518");
@@ -852,7 +852,7 @@ public class ParsingFieldUpdateProcessor
}
assertTrue(mixedDoubles.isEmpty());
- Map<Integer,Object> mixedInts = new LinkedHashMap<Integer,Object>(); // preserve order
+ Map<Integer,Object> mixedInts = new LinkedHashMap<>(); // preserve order
mixedInts.put(85, "85");
mixedInts.put(294423, 294423); // Integer-typed field value
mixedInts.put(-2894518, "-2,894,518");
@@ -865,7 +865,7 @@ public class ParsingFieldUpdateProcessor
}
assertTrue(mixedInts.isEmpty());
- Map<Long,Object> mixedLongs = new LinkedHashMap<Long,Object>(); // preserve order
+ Map<Long,Object> mixedLongs = new LinkedHashMap<>(); // preserve order
mixedLongs.put(85L, "85");
mixedLongs.put(42944233L, 42944233L); // Long-typed field value
mixedLongs.put(2894518L, "2,894,518");
@@ -878,7 +878,7 @@ public class ParsingFieldUpdateProcessor
}
assertTrue(mixedLongs.isEmpty());
- Map<Boolean,Object> mixedBooleans = new LinkedHashMap<Boolean,Object>(); // preserve order
+ Map<Boolean,Object> mixedBooleans = new LinkedHashMap<>(); // preserve order
mixedBooleans.put(true, "true");
mixedBooleans.put(false, false); // Boolean-typed field value
mixedBooleans.put(false, "false");
@@ -892,7 +892,7 @@ public class ParsingFieldUpdateProcessor
assertTrue(mixedBooleans.isEmpty());
dateTimeFormatter = ISODateTimeFormat.dateOptionalTimeParser().withZoneUTC();
- Map<Date,Object> mixedDates = new HashMap<Date,Object>();
+ Map<Date,Object> mixedDates = new HashMap<>();
dateStrings = new String[] { "2020-05-13T18:47", "1989-12-14", "1682-07-22T18:33:00.000Z" };
for (String dateString : dateStrings) {
mixedDates.put(dateTimeFormatter.parseDateTime(dateString).toDate(), dateString);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java Wed Mar 12 18:14:05 2014
@@ -253,7 +253,7 @@ public class SignatureUpdateProcessorFac
public void testFailNonIndexedSigWithOverwriteDupes() throws Exception {
SolrCore core = h.getCore();
SignatureUpdateProcessorFactory f = new SignatureUpdateProcessorFactory();
- NamedList<String> initArgs = new NamedList<String>();
+ NamedList<String> initArgs = new NamedList<>();
initArgs.add("overwriteDupes", "true");
initArgs.add("signatureField", "signatureField_sS");
f.init(initArgs);
@@ -278,7 +278,7 @@ public class SignatureUpdateProcessorFac
.getFactories()[0]);
factory.setEnabled(true);
- Map<String,String[]> params = new HashMap<String,String[]>();
+ Map<String,String[]> params = new HashMap<>();
MultiMapSolrParams mmparams = new MultiMapSolrParams(params);
params.put(UpdateParams.UPDATE_CHAIN, new String[] {chain});
@@ -307,7 +307,7 @@ public class SignatureUpdateProcessorFac
SolrInputDocument docA = new SolrInputDocument();
SolrInputDocument docB = new SolrInputDocument();
- UnusualList<Integer> ints = new UnusualList<Integer>(3);
+ UnusualList<Integer> ints = new UnusualList<>(3);
for (int val : new int[] {42, 66, 34}) {
docA.addField("ints_is", new Integer(val));
ints.add(val);
@@ -333,7 +333,7 @@ public class SignatureUpdateProcessorFac
}
- ArrayList<ContentStream> streams = new ArrayList<ContentStream>(2);
+ ArrayList<ContentStream> streams = new ArrayList<>(2);
streams.add(new BinaryRequestWriter().getContentStream(ureq));
LocalSolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), mmparams);
try {
@@ -368,7 +368,7 @@ public class SignatureUpdateProcessorFac
}
static void addDoc(String doc, String chain) throws Exception {
- Map<String, String[]> params = new HashMap<String, String[]>();
+ Map<String, String[]> params = new HashMap<>();
MultiMapSolrParams mmparams = new MultiMapSolrParams(params);
params.put(UpdateParams.UPDATE_CHAIN, new String[] { chain });
SolrQueryRequestBase req = new SolrQueryRequestBase(h.getCore(),
@@ -377,7 +377,7 @@ public class SignatureUpdateProcessorFac
UpdateRequestHandler handler = new UpdateRequestHandler();
handler.init(null);
- ArrayList<ContentStream> streams = new ArrayList<ContentStream>(2);
+ ArrayList<ContentStream> streams = new ArrayList<>(2);
streams.add(new ContentStreamBase.StringStream(doc));
req.setContentStreams(streams);
handler.handleRequestBody(req, new SolrQueryResponse());
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java Wed Mar 12 18:14:05 2014
@@ -77,7 +77,7 @@ public class StatelessScriptUpdateProces
SolrCore core = h.getCore();
UpdateRequestProcessorChain chained = core.getUpdateProcessingChain("single-script");
final StatelessScriptUpdateProcessorFactory factory = ((StatelessScriptUpdateProcessorFactory) chained.getFactories()[0]);
- final List<String> functionMessages = new ArrayList<String>();
+ final List<String> functionMessages = new ArrayList<>();
factory.setScriptEngineCustomizer(new ScriptEngineCustomizer() {
@Override
public void customize(ScriptEngine engine) {
@@ -122,7 +122,7 @@ public class StatelessScriptUpdateProces
UpdateRequestProcessorChain chained = core.getUpdateProcessingChain(chain);
final StatelessScriptUpdateProcessorFactory factory =
((StatelessScriptUpdateProcessorFactory) chained.getFactories()[0]);
- final List<String> functionMessages = new ArrayList<String>();
+ final List<String> functionMessages = new ArrayList<>();
ScriptEngineCustomizer customizer = new ScriptEngineCustomizer() {
@Override
public void customize(ScriptEngine engine) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java Wed Mar 12 18:14:05 2014
@@ -106,7 +106,7 @@ public class UniqFieldsUpdateProcessorFa
}
private void addDoc(String doc) throws Exception {
- Map<String, String[]> params = new HashMap<String, String[]>();
+ Map<String, String[]> params = new HashMap<>();
MultiMapSolrParams mmparams = new MultiMapSolrParams(params);
params.put(UpdateParams.UPDATE_CHAIN, new String[] { "uniq-fields" });
SolrQueryRequestBase req = new SolrQueryRequestBase(h.getCore(),
@@ -115,7 +115,7 @@ public class UniqFieldsUpdateProcessorFa
UpdateRequestHandler handler = new UpdateRequestHandler();
handler.init(null);
- ArrayList<ContentStream> streams = new ArrayList<ContentStream>(2);
+ ArrayList<ContentStream> streams = new ArrayList<>(2);
streams.add(new ContentStreamBase.StringStream(doc));
req.setContentStreams(streams);
handler.handleRequestBody(req, new SolrQueryResponse());
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/CircularListTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/CircularListTest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/CircularListTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/CircularListTest.java Wed Mar 12 18:14:05 2014
@@ -30,7 +30,7 @@ public class CircularListTest extends L
@Test
public void testCircularList() throws IOException {
- CircularList<Integer> list = new CircularList<Integer>(10);
+ CircularList<Integer> list = new CircularList<>(10);
for(int i=0;i<10; i++) {
list.add(new Integer(i));
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java Wed Mar 12 18:14:05 2014
@@ -23,7 +23,7 @@ import org.apache.solr.common.util.Simpl
public class DOMUtilTest extends DOMUtilTestBase {
public void testAddToNamedListPrimitiveTypes() throws Exception {
- NamedList<Object> namedList = new SimpleOrderedMap<Object>();
+ NamedList<Object> namedList = new SimpleOrderedMap<>();
DOMUtil.addToNamedList( getNode( "<str name=\"String\">STRING</str>", "/str" ), namedList, null );
assertTypeAndValue( namedList, "String", "STRING" );
DOMUtil.addToNamedList( getNode( "<int name=\"Integer\">100</int>", "/int" ), namedList, null );
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java Wed Mar 12 18:14:05 2014
@@ -314,7 +314,7 @@ public class DateMathParserTest extends
DateMathParser p = new DateMathParser(UTC, Locale.ROOT);
p.setNow(parser.parse("2001-07-04T12:08:56.235"));
- Map<String,Integer> badCommands = new HashMap<String,Integer>();
+ Map<String,Integer> badCommands = new HashMap<>();
badCommands.put("/", 1);
badCommands.put("+", 1);
badCommands.put("-", 1);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java Wed Mar 12 18:14:05 2014
@@ -177,8 +177,8 @@ public class SimplePostToolTest extends
}
static class MockPageFetcher extends PageFetcher {
- HashMap<String,String> htmlMap = new HashMap<String,String>();
- HashMap<String,Set<URL>> linkMap = new HashMap<String,Set<URL>>();
+ HashMap<String,String> htmlMap = new HashMap<>();
+ HashMap<String,Set<URL>> linkMap = new HashMap<>();
public MockPageFetcher() throws IOException {
(new SimplePostTool()).super();
@@ -190,18 +190,18 @@ public class SimplePostToolTest extends
htmlMap.put("http://[ff01::114]/page2", "<html><body><a href=\"http://[ff01::114]/\"><a href=\"http://[ff01::114]/disallowed\"/></body></html>");
htmlMap.put("http://[ff01::114]/disallowed", "<html><body><a href=\"http://[ff01::114]/\"></body></html>");
- Set<URL> s = new HashSet<URL>();
+ Set<URL> s = new HashSet<>();
s.add(new URL("http://[ff01::114]/page1"));
s.add(new URL("http://[ff01::114]/page2"));
linkMap.put("http://[ff01::114]", s);
linkMap.put("http://[ff01::114]/index.html", s);
- s = new HashSet<URL>();
+ s = new HashSet<>();
s.add(new URL("http://[ff01::114]/page1/foo"));
linkMap.put("http://[ff01::114]/page1", s);
- s = new HashSet<URL>();
+ s = new HashSet<>();
s.add(new URL("http://[ff01::114]/page1/foo/bar"));
linkMap.put("http://[ff01::114]/page1/foo", s);
- s = new HashSet<URL>();
+ s = new HashSet<>();
s.add(new URL("http://[ff01::114]/disallowed"));
linkMap.put("http://[ff01::114]/page2", s);
@@ -237,7 +237,7 @@ public class SimplePostToolTest extends
public Set<URL> getLinksFromWebPage(URL u, InputStream is, String type, URL postUrl) {
Set<URL> s = linkMap.get(SimplePostTool.normalizeUrlEnding(u.toString()));
if(s == null)
- s = new HashSet<URL>();
+ s = new HashSet<>();
return s;
}
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java Wed Mar 12 18:14:05 2014
@@ -76,7 +76,7 @@ public class SolrPluginUtilsTest extends
DocList docs = qr.getDocList();
assertEquals("wrong docs size", 3, docs.size());
- Set<String> fields = new HashSet<String>();
+ Set<String> fields = new HashSet<>();
fields.add("val_dynamic");
fields.add("dynamic_val");
fields.add("range_facet_l"); // copied from id
@@ -149,7 +149,7 @@ public class SolrPluginUtilsTest extends
@Test
public void testParseFieldBoosts() throws Exception {
- Map<String,Float> e1 = new HashMap<String,Float>();
+ Map<String,Float> e1 = new HashMap<>();
e1.put("fieldOne",2.3f);
e1.put("fieldTwo",null);
e1.put("fieldThree",-0.4f);
@@ -165,7 +165,7 @@ public class SolrPluginUtilsTest extends
" fieldTwo fieldThree^-0.4 ",
" "}));
- Map<String,Float> e2 = new HashMap<String,Float>();
+ Map<String,Float> e2 = new HashMap<>();
assertEquals("empty e2", e2, SolrPluginUtils.parseFieldBoosts
(""));
assertEquals("spacey e2", e2, SolrPluginUtils.parseFieldBoosts
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TestFastWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TestFastWriter.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TestFastWriter.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TestFastWriter.java Wed Mar 12 18:14:05 2014
@@ -28,7 +28,7 @@ import java.util.Random;
class MemWriter extends FastWriter {
- public List<char[]> buffers = new LinkedList<char[]>();
+ public List<char[]> buffers = new LinkedList<>();
Random r;
public MemWriter(char[] tempBuffer, Random r) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TestNumberUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TestNumberUtils.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TestNumberUtils.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TestNumberUtils.java Wed Mar 12 18:14:05 2014
@@ -126,7 +126,7 @@ public class TestNumberUtils extends Luc
int iter=1000;
// INTEGERS
- List<Converter> converters = new ArrayList<Converter>();
+ List<Converter> converters = new ArrayList<>();
converters.add( new Int2Int() );
converters.add( new SortInt() );
converters.add( new Base10kS() );
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TestUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TestUtils.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TestUtils.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TestUtils.java Wed Mar 12 18:14:05 2014
@@ -74,20 +74,20 @@ public class TestUtils extends LuceneTes
public void testNamedLists()
{
- SimpleOrderedMap<Integer> map = new SimpleOrderedMap<Integer>();
+ SimpleOrderedMap<Integer> map = new SimpleOrderedMap<>();
map.add( "test", 10 );
SimpleOrderedMap<Integer> clone = map.clone();
assertEquals( map.toString(), clone.toString() );
assertEquals( new Integer(10), clone.get( "test" ) );
- Map<String,Integer> realMap = new HashMap<String, Integer>();
+ Map<String,Integer> realMap = new HashMap<>();
realMap.put( "one", 1 );
realMap.put( "two", 2 );
realMap.put( "three", 3 );
- map = new SimpleOrderedMap<Integer>();
+ map = new SimpleOrderedMap<>();
map.addAll( realMap );
assertEquals( 3, map.size() );
- map = new SimpleOrderedMap<Integer>();
+ map = new SimpleOrderedMap<>();
map.add( "one", 1 );
map.add( "two", 2 );
map.add( "three", 3 );
@@ -101,7 +101,7 @@ public class TestUtils extends LuceneTes
assertEquals( 4, map.indexOf( null, 1 ) );
assertEquals( null, map.get( null, 1 ) );
- map = new SimpleOrderedMap<Integer>();
+ map = new SimpleOrderedMap<>();
map.add( "one", 1 );
map.add( "two", 2 );
Iterator<Map.Entry<String, Integer>> iter = map.iterator();
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java Wed Mar 12 18:14:05 2014
@@ -46,7 +46,7 @@ public class TimeZoneUtilsTest extends L
public void testValidIds() throws Exception {
- final Set<String> idsTested = new HashSet<String>();
+ final Set<String> idsTested = new HashSet<>();
// brain dead: anything the JVM supports, should work
for (String validId : TimeZone.getAvailableIDs()) {
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java Wed Mar 12 18:14:05 2014
@@ -620,7 +620,7 @@ public class SolrQuery extends Modifiabl
* @since 4.2
*/
public SolrQuery setSorts(List<SortClause> value) {
- sortClauses = new ArrayList<SortClause>(value);
+ sortClauses = new ArrayList<>(value);
serializeSorts();
return this;
}
@@ -674,7 +674,7 @@ public class SolrQuery extends Modifiabl
* @since 4.2
*/
public SolrQuery addSort(SortClause sortClause) {
- if (sortClauses == null) sortClauses = new ArrayList<SortClause>();
+ if (sortClauses == null) sortClauses = new ArrayList<>();
sortClauses.add(sortClause);
serializeSorts();
return this;
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java Wed Mar 12 18:14:05 2014
@@ -86,7 +86,7 @@ public abstract class SolrServer impleme
*/
public UpdateResponse addBeans(Collection<?> beans, int commitWithinMs) throws SolrServerException, IOException {
DocumentObjectBinder binder = this.getBinder();
- ArrayList<SolrInputDocument> docs = new ArrayList<SolrInputDocument>(beans.size());
+ ArrayList<SolrInputDocument> docs = new ArrayList<>(beans.size());
for (Object bean : beans) {
docs.add(binder.toSolrInputDocument(bean));
}
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java Wed Mar 12 18:14:05 2014
@@ -34,14 +34,14 @@ import java.nio.ByteBuffer;
*/
public class DocumentObjectBinder {
- private final Map<Class, List<DocField>> infocache = new ConcurrentHashMap<Class, List<DocField>>();
+ private final Map<Class, List<DocField>> infocache = new ConcurrentHashMap<>();
public DocumentObjectBinder() {
}
public <T> List<T> getBeans(Class<T> clazz, SolrDocumentList solrDocList) {
List<DocField> fields = getDocFields(clazz);
- List<T> result = new ArrayList<T>(solrDocList.size());
+ List<T> result = new ArrayList<>(solrDocList.size());
for (SolrDocument sdoc : solrDocList) {
result.add(getBean(clazz, fields, sdoc));
@@ -103,9 +103,9 @@ public class DocumentObjectBinder {
}
private List<DocField> collectInfo(Class clazz) {
- List<DocField> fields = new ArrayList<DocField>();
+ List<DocField> fields = new ArrayList<>();
Class superClazz = clazz;
- List<AccessibleObject> members = new ArrayList<AccessibleObject>();
+ List<AccessibleObject> members = new ArrayList<>();
while (superClazz != null && superClazz != Object.class) {
members.addAll(Arrays.asList(superClazz.getDeclaredFields()));
@@ -275,7 +275,7 @@ public class DocumentObjectBinder {
Map<String, Object> allValuesMap = null;
List allValuesList = null;
if (isContainedInMap) {
- allValuesMap = new HashMap<String, Object>();
+ allValuesMap = new HashMap<>();
} else {
allValuesList = new ArrayList();
}
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java Wed Mar 12 18:14:05 2014
@@ -46,7 +46,7 @@ public class BinaryRequestWriter extends
&& (updateRequest.getDocIterator() == null) ) {
return null;
}
- List<ContentStream> l = new ArrayList<ContentStream>();
+ List<ContentStream> l = new ArrayList<>();
l.add(new LazyContentStream(updateRequest));
return l;
} else {
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java Wed Mar 12 18:14:05 2014
@@ -97,7 +97,7 @@ public class CloudSolrServer extends Sol
private String idField = "id";
private final Set<String> NON_ROUTABLE_PARAMS;
{
- NON_ROUTABLE_PARAMS = new HashSet<String>();
+ NON_ROUTABLE_PARAMS = new HashSet<>();
NON_ROUTABLE_PARAMS.add(UpdateParams.EXPUNGE_DELETES);
NON_ROUTABLE_PARAMS.add(UpdateParams.MAX_OPTIMIZE_SEGMENTS);
NON_ROUTABLE_PARAMS.add(UpdateParams.COMMIT);
@@ -322,7 +322,7 @@ public class CloudSolrServer extends Sol
long start = System.nanoTime();
if (parallelUpdates) {
- final Map<String, Future<NamedList<?>>> responseFutures = new HashMap<String, Future<NamedList<?>>>(routes.size());
+ final Map<String, Future<NamedList<?>>> responseFutures = new HashMap<>(routes.size());
for (final Map.Entry<String, LBHttpSolrServer.Req> entry : routes.entrySet()) {
final String url = entry.getKey();
final LBHttpSolrServer.Req lbRequest = entry.getValue();
@@ -373,7 +373,7 @@ public class CloudSolrServer extends Sol
Set<String> paramNames = nonRoutableParams.getParameterNames();
- Set<String> intersection = new HashSet<String>(paramNames);
+ Set<String> intersection = new HashSet<>(paramNames);
intersection.retainAll(NON_ROUTABLE_PARAMS);
if (nonRoutableRequest != null || intersection.size() > 0) {
@@ -381,7 +381,7 @@ public class CloudSolrServer extends Sol
nonRoutableRequest = new UpdateRequest();
}
nonRoutableRequest.setParams(nonRoutableParams);
- List<String> urlList = new ArrayList<String>();
+ List<String> urlList = new ArrayList<>();
urlList.addAll(routes.keySet());
Collections.shuffle(urlList, rand);
LBHttpSolrServer.Req req = new LBHttpSolrServer.Req(nonRoutableRequest, urlList);
@@ -402,13 +402,13 @@ public class CloudSolrServer extends Sol
}
private Map<String,List<String>> buildUrlMap(DocCollection col) {
- Map<String, List<String>> urlMap = new HashMap<String, List<String>>();
+ Map<String, List<String>> urlMap = new HashMap<>();
Collection<Slice> slices = col.getActiveSlices();
Iterator<Slice> sliceIterator = slices.iterator();
while (sliceIterator.hasNext()) {
Slice slice = sliceIterator.next();
String name = slice.getName();
- List<String> urls = new ArrayList<String>();
+ List<String> urls = new ArrayList<>();
Replica leader = slice.getLeader();
if (leader == null) {
// take unoptimized general path - we cannot find a leader yet
@@ -514,14 +514,14 @@ public class CloudSolrServer extends Sol
}
}
sendToLeaders = true;
- replicas = new ArrayList<String>();
+ replicas = new ArrayList<>();
}
SolrParams reqParams = request.getParams();
if (reqParams == null) {
reqParams = new ModifiableSolrParams();
}
- List<String> theUrlList = new ArrayList<String>();
+ List<String> theUrlList = new ArrayList<>();
if (request.getPath().equals("/admin/collections")
|| request.getPath().equals("/admin/cores")) {
Set<String> liveNodes = clusterState.getLiveNodes();
@@ -549,7 +549,7 @@ public class CloudSolrServer extends Sol
// Retrieve slices from the cloud state and, for each collection
// specified,
// add it to the Map of slices.
- Map<String,Slice> slices = new HashMap<String,Slice>();
+ Map<String,Slice> slices = new HashMap<>();
for (String collectionName : collectionsList) {
Collection<Slice> colSlices = clusterState
.getActiveSlices(collectionName);
@@ -567,8 +567,8 @@ public class CloudSolrServer extends Sol
// build a map of unique nodes
// TODO: allow filtering by group, role, etc
- Map<String,ZkNodeProps> nodes = new HashMap<String,ZkNodeProps>();
- List<String> urlList2 = new ArrayList<String>();
+ Map<String,ZkNodeProps> nodes = new HashMap<>();
+ List<String> urlList2 = new ArrayList<>();
for (Slice slice : slices.values()) {
for (ZkNodeProps nodeProps : slice.getReplicasMap().values()) {
ZkCoreNodeProps coreNodeProps = new ZkCoreNodeProps(nodeProps);
@@ -609,15 +609,15 @@ public class CloudSolrServer extends Sol
}
if (sendToLeaders) {
- theUrlList = new ArrayList<String>(leaderUrlList.size());
+ theUrlList = new ArrayList<>(leaderUrlList.size());
theUrlList.addAll(leaderUrlList);
} else {
- theUrlList = new ArrayList<String>(urlList.size());
+ theUrlList = new ArrayList<>(urlList.size());
theUrlList.addAll(urlList);
}
Collections.shuffle(theUrlList, rand);
if (sendToLeaders) {
- ArrayList<String> theReplicas = new ArrayList<String>(
+ ArrayList<String> theReplicas = new ArrayList<>(
replicasList.size());
theReplicas.addAll(replicasList);
Collections.shuffle(theReplicas, rand);
@@ -640,7 +640,7 @@ public class CloudSolrServer extends Sol
String collection) {
// Extract each comma separated collection name and store in a List.
List<String> rawCollectionsList = StrUtils.splitSmart(collection, ",", true);
- Set<String> collectionsList = new HashSet<String>();
+ Set<String> collectionsList = new HashSet<>();
// validate collections
for (String collectionName : rawCollectionsList) {
if (!clusterState.getCollections().contains(collectionName)) {
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java Wed Mar 12 18:14:05 2014
@@ -121,9 +121,9 @@ public class ConcurrentUpdateSolrServer
HttpClient client, int queueSize, int threadCount, ExecutorService es, boolean streamDeletes) {
this.server = new HttpSolrServer(solrServerUrl, client);
this.server.setFollowRedirects(false);
- queue = new LinkedBlockingQueue<UpdateRequest>(queueSize);
+ queue = new LinkedBlockingQueue<>(queueSize);
this.threadCount = threadCount;
- runners = new LinkedList<Runner>();
+ runners = new LinkedList<>();
scheduler = es;
this.streamDeletes = streamDeletes;
}
@@ -364,7 +364,7 @@ public class ConcurrentUpdateSolrServer
}
// RETURN A DUMMY result
- NamedList<Object> dummy = new NamedList<Object>();
+ NamedList<Object> dummy = new NamedList<>();
dummy.add("NOTE", "the request is processed in a background stream");
return dummy;
}
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java Wed Mar 12 18:14:05 2014
@@ -269,7 +269,7 @@ public class HttpSolrServer extends Solr
}
}
- LinkedList<NameValuePair> postParams = new LinkedList<NameValuePair>();
+ LinkedList<NameValuePair> postParams = new LinkedList<>();
if (streams == null || isMultipart) {
HttpPost post = new HttpPost(url + ClientUtils.toQueryString( queryParams, false ));
post.setHeader("Content-Charset", "UTF-8");
@@ -278,7 +278,7 @@ public class HttpSolrServer extends Solr
"application/x-www-form-urlencoded; charset=UTF-8");
}
- List<FormBodyPart> parts = new LinkedList<FormBodyPart>();
+ List<FormBodyPart> parts = new LinkedList<>();
Iterator<String> iter = wparams.getParameterNamesIterator();
while (iter.hasNext()) {
String p = iter.next();
@@ -436,7 +436,7 @@ public class HttpSolrServer extends Solr
if (processor == null) {
// no processor specified, return raw stream
- NamedList<Object> rsp = new NamedList<Object>();
+ NamedList<Object> rsp = new NamedList<>();
rsp.add("stream", respBody);
// Only case where stream should not be closed
shouldClose = false;
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java Wed Mar 12 18:14:05 2014
@@ -76,7 +76,7 @@ import java.util.*;
* @since solr 1.4
*/
public class LBHttpSolrServer extends SolrServer {
- private static Set<Integer> RETRY_CODES = new HashSet<Integer>(4);
+ private static Set<Integer> RETRY_CODES = new HashSet<>(4);
static {
RETRY_CODES.add(404);
@@ -87,10 +87,10 @@ public class LBHttpSolrServer extends So
// keys to the maps are currently of the form "http://localhost:8983/solr"
// which should be equivalent to CommonsHttpSolrServer.getBaseURL()
- private final Map<String, ServerWrapper> aliveServers = new LinkedHashMap<String, ServerWrapper>();
+ private final Map<String, ServerWrapper> aliveServers = new LinkedHashMap<>();
// access to aliveServers should be synchronized on itself
- protected final Map<String, ServerWrapper> zombieServers = new ConcurrentHashMap<String, ServerWrapper>();
+ protected final Map<String, ServerWrapper> zombieServers = new ConcurrentHashMap<>();
// changes to aliveServers are reflected in this array, no need to synchronize
private volatile ServerWrapper[] aliveServerList = new ServerWrapper[0];
@@ -283,7 +283,7 @@ public class LBHttpSolrServer extends So
Rsp rsp = new Rsp();
Exception ex = null;
boolean isUpdate = req.request instanceof IsUpdateRequest;
- List<ServerWrapper> skipped = new ArrayList<ServerWrapper>(req.getNumDeadServersToTry());
+ List<ServerWrapper> skipped = new ArrayList<>(req.getNumDeadServersToTry());
for (String serverStr : req.getServers()) {
serverStr = normalize(serverStr);
@@ -505,7 +505,7 @@ public class LBHttpSolrServer extends So
if (e.getRootCause() instanceof IOException) {
ex = e;
moveAliveToDead(wrapper);
- if (justFailed == null) justFailed = new HashMap<String,ServerWrapper>();
+ if (justFailed == null) justFailed = new HashMap<>();
justFailed.put(wrapper.getKey(), wrapper);
} else {
throw e;
@@ -619,7 +619,7 @@ public class LBHttpSolrServer extends So
aliveCheckExecutor = Executors.newSingleThreadScheduledExecutor(
new SolrjNamedThreadFactory("aliveCheckExecutor"));
aliveCheckExecutor.scheduleAtFixedRate(
- getAliveCheckRunner(new WeakReference<LBHttpSolrServer>(this)),
+ getAliveCheckRunner(new WeakReference<>(this)),
this.interval, this.interval, TimeUnit.MILLISECONDS);
}
}
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/NoOpResponseParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/NoOpResponseParser.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/NoOpResponseParser.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/NoOpResponseParser.java Wed Mar 12 18:14:05 2014
@@ -57,7 +57,7 @@ public class NoOpResponseParser extends
StringWriter writer = new StringWriter();
IOUtils.copy(reader, writer);
String output = writer.toString();
- NamedList<Object> list = new NamedList<Object>();
+ NamedList<Object> list = new NamedList<>();
list.add("response", output);
return list;
} catch (IOException e) {
@@ -71,7 +71,7 @@ public class NoOpResponseParser extends
StringWriter writer = new StringWriter();
IOUtils.copy(body, writer, encoding);
String output = writer.toString();
- NamedList<Object> list = new NamedList<Object>();
+ NamedList<Object> list = new NamedList<>();
list.add("response", output);
return list;
} catch (IOException e) {
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java Wed Mar 12 18:14:05 2014
@@ -135,7 +135,7 @@ public class XMLResponseParser extends R
response = readNamedList( parser );
}
else if( name.equals( "solr" ) ) {
- return new SimpleOrderedMap<Object>();
+ return new SimpleOrderedMap<>();
}
else {
throw new Exception( "really needs to be response or result. " +
@@ -212,7 +212,7 @@ public class XMLResponseParser extends R
}
StringBuilder builder = new StringBuilder();
- NamedList<Object> nl = new SimpleOrderedMap<Object>();
+ NamedList<Object> nl = new SimpleOrderedMap<>();
KnownType type = null;
String name = null;
@@ -284,7 +284,7 @@ public class XMLResponseParser extends R
StringBuilder builder = new StringBuilder();
KnownType type = null;
- List<Object> vals = new ArrayList<Object>();
+ List<Object> vals = new ArrayList<>();
int depth = 0;
while( true )
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java Wed Mar 12 18:14:05 2014
@@ -45,7 +45,7 @@ public class ContentStreamUpdateRequest
*/
public ContentStreamUpdateRequest(String url) {
super(METHOD.POST, url);
- contentStreams = new ArrayList<ContentStream>();
+ contentStreams = new ArrayList<>();
}
@Override
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java Wed Mar 12 18:14:05 2014
@@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit;
*/
public class DocumentAnalysisRequest extends SolrRequest {
- private List<SolrInputDocument> documents = new ArrayList<SolrInputDocument>();
+ private List<SolrInputDocument> documents = new ArrayList<>();
private String query;
private boolean showMatch = false;
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java Wed Mar 12 18:14:05 2014
@@ -212,7 +212,7 @@ public class FieldAnalysisRequest extend
*/
public FieldAnalysisRequest addFieldName(String fieldName) {
if (fieldNames == null) {
- fieldNames = new LinkedList<String>();
+ fieldNames = new LinkedList<>();
}
fieldNames.add(fieldName);
return this;
@@ -249,7 +249,7 @@ public class FieldAnalysisRequest extend
*/
public FieldAnalysisRequest addFieldType(String fieldTypeName) {
if (fieldTypes == null) {
- fieldTypes = new LinkedList<String>();
+ fieldTypes = new LinkedList<>();
}
fieldTypes.add(fieldTypeName);
return this;
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/LukeRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/LukeRequest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/LukeRequest.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/LukeRequest.java Wed Mar 12 18:14:05 2014
@@ -59,7 +59,7 @@ public class LukeRequest extends SolrReq
public void addField( String f )
{
if( fields == null ) {
- fields = new ArrayList<String>();
+ fields = new ArrayList<>();
}
fields.add( f );
}
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java Wed Mar 12 18:14:05 2014
@@ -44,7 +44,7 @@ public class RequestWriter {
if (req instanceof UpdateRequest) {
UpdateRequest updateRequest = (UpdateRequest) req;
if (isEmpty(updateRequest)) return null;
- List<ContentStream> l = new ArrayList<ContentStream>();
+ List<ContentStream> l = new ArrayList<>();
l.add(new LazyContentStream(updateRequest));
return l;
}
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java Wed Mar 12 18:14:05 2014
@@ -86,7 +86,7 @@ public class UpdateRequest extends Abstr
public UpdateRequest add(final SolrInputDocument doc) {
if (documents == null) {
- documents = new LinkedHashMap<SolrInputDocument,Map<String,Object>>();
+ documents = new LinkedHashMap<>();
}
documents.put(doc, null);
return this;
@@ -103,9 +103,9 @@ public class UpdateRequest extends Abstr
public UpdateRequest add(final SolrInputDocument doc, Integer commitWithin,
Boolean overwrite) {
if (documents == null) {
- documents = new LinkedHashMap<SolrInputDocument,Map<String,Object>>();
+ documents = new LinkedHashMap<>();
}
- Map<String,Object> params = new HashMap<String,Object>(2);
+ Map<String,Object> params = new HashMap<>(2);
if (commitWithin != null) params.put(COMMIT_WITHIN, commitWithin);
if (overwrite != null) params.put(OVERWRITE, overwrite);
@@ -116,7 +116,7 @@ public class UpdateRequest extends Abstr
public UpdateRequest add(final Collection<SolrInputDocument> docs) {
if (documents == null) {
- documents = new LinkedHashMap<SolrInputDocument,Map<String,Object>>();
+ documents = new LinkedHashMap<>();
}
for (SolrInputDocument doc : docs) {
documents.put(doc, null);
@@ -126,7 +126,7 @@ public class UpdateRequest extends Abstr
public UpdateRequest deleteById(String id) {
if (deleteById == null) {
- deleteById = new LinkedHashMap<String,Map<String,Object>>();
+ deleteById = new LinkedHashMap<>();
}
deleteById.put(id, null);
return this;
@@ -134,7 +134,7 @@ public class UpdateRequest extends Abstr
public UpdateRequest deleteById(List<String> ids) {
if (deleteById == null) {
- deleteById = new LinkedHashMap<String,Map<String,Object>>();
+ deleteById = new LinkedHashMap<>();
}
for (String id : ids) {
@@ -146,9 +146,9 @@ public class UpdateRequest extends Abstr
public UpdateRequest deleteById(String id, Long version) {
if (deleteById == null) {
- deleteById = new LinkedHashMap<String,Map<String,Object>>();
+ deleteById = new LinkedHashMap<>();
}
- Map<String,Object> params = new HashMap<String,Object>(1);
+ Map<String,Object> params = new HashMap<>(1);
params.put(VER, version);
deleteById.put(id, params);
return this;
@@ -156,7 +156,7 @@ public class UpdateRequest extends Abstr
public UpdateRequest deleteByQuery(String q) {
if (deleteQuery == null) {
- deleteQuery = new ArrayList<String>();
+ deleteQuery = new ArrayList<>();
}
deleteQuery.add(q);
return this;
@@ -179,7 +179,7 @@ public class UpdateRequest extends Abstr
return null;
}
- Map<String,LBHttpSolrServer.Req> routes = new HashMap<String,LBHttpSolrServer.Req>();
+ Map<String,LBHttpSolrServer.Req> routes = new HashMap<>();
if (documents != null) {
Set<Entry<SolrInputDocument,Map<String,Object>>> entries = documents.entrySet();
for (Entry<SolrInputDocument,Map<String,Object>> entry : entries) {
@@ -278,7 +278,7 @@ public class UpdateRequest extends Abstr
}
private List<Map<SolrInputDocument,Map<String,Object>>> getDocLists(Map<SolrInputDocument,Map<String,Object>> documents) {
- List<Map<SolrInputDocument,Map<String,Object>>> docLists = new ArrayList<Map<SolrInputDocument,Map<String,Object>>>();
+ List<Map<SolrInputDocument,Map<String,Object>>> docLists = new ArrayList<>();
Map<SolrInputDocument,Map<String,Object>> docList = null;
if (this.documents != null) {
@@ -297,7 +297,7 @@ public class UpdateRequest extends Abstr
}
if (overwrite != lastOverwrite || commitWithin != lastCommitWithin
|| docLists.size() == 0) {
- docList = new LinkedHashMap<SolrInputDocument,Map<String,Object>>();
+ docList = new LinkedHashMap<>();
docLists.add(docList);
}
docList.put(entry.getKey(), entry.getValue());
@@ -307,7 +307,7 @@ public class UpdateRequest extends Abstr
}
if (docIterator != null) {
- docList = new LinkedHashMap<SolrInputDocument,Map<String,Object>>();
+ docList = new LinkedHashMap<>();
docLists.add(docList);
while (docIterator.hasNext()) {
SolrInputDocument doc = docIterator.next();
@@ -404,7 +404,7 @@ public class UpdateRequest extends Abstr
public List<SolrInputDocument> getDocuments() {
if (documents == null) return null;
- List<SolrInputDocument> docs = new ArrayList<SolrInputDocument>(documents.size());
+ List<SolrInputDocument> docs = new ArrayList<>(documents.size());
docs.addAll(documents.keySet());
return docs;
}
@@ -419,7 +419,7 @@ public class UpdateRequest extends Abstr
public List<String> getDeleteById() {
if (deleteById == null) return null;
- List<String> deletes = new ArrayList<String>(deleteById.keySet());
+ List<String> deletes = new ArrayList<>(deleteById.keySet());
return deletes;
}
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/AnalysisResponseBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/AnalysisResponseBase.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/AnalysisResponseBase.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/AnalysisResponseBase.java Wed Mar 12 18:14:05 2014
@@ -63,7 +63,7 @@ public class AnalysisResponseBase extend
* @return The built analysis phases list.
*/
protected List<AnalysisPhase> buildPhases(NamedList<List<NamedList<Object>>> phaseNL) {
- List<AnalysisPhase> phases = new ArrayList<AnalysisPhase>(phaseNL.size());
+ List<AnalysisPhase> phases = new ArrayList<>(phaseNL.size());
for (Map.Entry<String, List<NamedList<Object>>> phaseEntry : phaseNL) {
AnalysisPhase phase = new AnalysisPhase(phaseEntry.getKey());
List<NamedList<Object>> tokens = phaseEntry.getValue();
@@ -116,7 +116,7 @@ public class AnalysisResponseBase extend
public static class AnalysisPhase {
private final String className;
- private List<TokenInfo> tokens = new ArrayList<TokenInfo>();
+ private List<TokenInfo> tokens = new ArrayList<>();
AnalysisPhase(String className) {
this.className = className;
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/CollectionAdminResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/CollectionAdminResponse.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/CollectionAdminResponse.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/CollectionAdminResponse.java Wed Mar 12 18:14:05 2014
@@ -46,7 +46,7 @@ public class CollectionAdminResponse ext
@SuppressWarnings("unchecked")
public Map<String, NamedList<Integer>> getCollectionCoresStatus()
{
- Map<String, NamedList<Integer>> res = new HashMap<String, NamedList<Integer>>();
+ Map<String, NamedList<Integer>> res = new HashMap<>();
NamedList<NamedList<Object>> cols = getCollectionStatus();
if( cols != null ) {
for (Map.Entry<String, NamedList<Object>> e : cols) {
@@ -64,7 +64,7 @@ public class CollectionAdminResponse ext
@SuppressWarnings("unchecked")
public Map<String, NamedList<Integer>> getCollectionNodesStatus()
{
- Map<String, NamedList<Integer>> res = new HashMap<String, NamedList<Integer>>();
+ Map<String, NamedList<Integer>> res = new HashMap<>();
NamedList<NamedList<Object>> cols = getCollectionStatus();
if( cols != null ) {
for (Map.Entry<String,NamedList<Object>> e : cols) {
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java Wed Mar 12 18:14:05 2014
@@ -33,7 +33,7 @@ import java.util.Map;
*/
public class DocumentAnalysisResponse extends AnalysisResponseBase implements Iterable<Map.Entry<String, DocumentAnalysisResponse.DocumentAnalysis>> {
- private final Map<String, DocumentAnalysis> documentAnalysisByKey = new HashMap<String, DocumentAnalysis>();
+ private final Map<String, DocumentAnalysis> documentAnalysisByKey = new HashMap<>();
/**
* {@inheritDoc}
@@ -116,7 +116,7 @@ public class DocumentAnalysisResponse ex
public static class DocumentAnalysis implements Iterable<Map.Entry<String, FieldAnalysis>> {
private final String documentKey;
- private Map<String, FieldAnalysis> fieldAnalysisByFieldName = new HashMap<String, FieldAnalysis>();
+ private Map<String, FieldAnalysis> fieldAnalysisByFieldName = new HashMap<>();
private DocumentAnalysis(String documentKey) {
this.documentKey = documentKey;
@@ -168,7 +168,7 @@ public class DocumentAnalysisResponse ex
private final String fieldName;
private List<AnalysisPhase> queryPhases;
- private Map<String, List<AnalysisPhase>> indexPhasesByFieldValue = new HashMap<String, List<AnalysisPhase>>();
+ private Map<String, List<AnalysisPhase>> indexPhasesByFieldValue = new HashMap<>();
private FieldAnalysis(String fieldName) {
this.fieldName = fieldName;
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/FacetField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/FacetField.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/FacetField.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/FacetField.java Wed Mar 12 18:14:05 2014
@@ -125,7 +125,7 @@ import org.apache.solr.client.solrj.util
public void add( String name, long cnt )
{
if( _values == null ) {
- _values = new ArrayList<Count>( 30 );
+ _values = new ArrayList<>( 30 );
}
_values.add( new Count( this, name, cnt ) );
}
@@ -136,7 +136,7 @@ import org.apache.solr.client.solrj.util
public void insert( String name, long cnt )
{
if( _values == null ) {
- _values = new ArrayList<Count>( 30 );
+ _values = new ArrayList<>( 30 );
}
_values.add( 0, new Count( this, name, cnt ) );
}
@@ -158,7 +158,7 @@ import org.apache.solr.client.solrj.util
{
FacetField ff = new FacetField( _name );
if( _values != null ) {
- ff._values = new ArrayList<Count>( _values.size() );
+ ff._values = new ArrayList<>( _values.size() );
for( Count c : _values ) {
if( c._count < max ) { // !equal to
ff._values.add( c );
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java Wed Mar 12 18:14:05 2014
@@ -32,8 +32,8 @@ import java.util.Map;
*/
public class FieldAnalysisResponse extends AnalysisResponseBase {
- private Map<String, Analysis> analysisByFieldTypeName = new HashMap<String, Analysis>();
- private Map<String, Analysis> analysisByFieldName = new HashMap<String, Analysis>();
+ private Map<String, Analysis> analysisByFieldTypeName = new HashMap<>();
+ private Map<String, Analysis> analysisByFieldName = new HashMap<>();
/**
* {@inheritDoc}
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldStatsInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldStatsInfo.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldStatsInfo.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldStatsInfo.java Wed Mar 12 18:14:05 2014
@@ -85,9 +85,9 @@ public class FieldStatsInfo implements S
else if( "facets".equals( entry.getKey() ) ) {
@SuppressWarnings("unchecked")
NamedList<Object> fields = (NamedList<Object>)entry.getValue();
- facets = new HashMap<String, List<FieldStatsInfo>>();
+ facets = new HashMap<>();
for( Map.Entry<String, Object> ev : fields ) {
- List<FieldStatsInfo> vals = new ArrayList<FieldStatsInfo>();
+ List<FieldStatsInfo> vals = new ArrayList<>();
facets.put( ev.getKey(), vals );
@SuppressWarnings("unchecked")
NamedList<NamedList<Object>> vnl = (NamedList<NamedList<Object>>) ev.getValue();
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/GroupCommand.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/GroupCommand.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/GroupCommand.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/GroupCommand.java Wed Mar 12 18:14:05 2014
@@ -45,7 +45,7 @@ import java.util.List;
public class GroupCommand implements Serializable {
private final String _name;
- private final List<Group> _values = new ArrayList<Group>();
+ private final List<Group> _values = new ArrayList<>();
private final int _matches;
private final Integer _ngroups;
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/GroupResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/GroupResponse.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/GroupResponse.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/GroupResponse.java Wed Mar 12 18:14:05 2014
@@ -34,7 +34,7 @@ import java.util.List;
*/
public class GroupResponse implements Serializable {
- private final List<GroupCommand> _values = new ArrayList<GroupCommand>();
+ private final List<GroupCommand> _values = new ArrayList<>();
/**
* Adds a grouping command to the response.
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/LukeResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/LukeResponse.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/LukeResponse.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/LukeResponse.java Wed Mar 12 18:14:05 2014
@@ -91,7 +91,7 @@ public class LukeResponse extends SolrRe
String key = entry.getKey();
if ("fields".equals(key) && entry.getValue() != null) {
List<String> theFields = (List<String>) entry.getValue();
- fields = new ArrayList<String>(theFields);
+ fields = new ArrayList<>(theFields);
} else if ("tokenized".equals(key) == true) {
tokenized = Boolean.parseBoolean(entry.getValue().toString());
} else if ("analyzer".equals(key) == true) {
@@ -202,7 +202,7 @@ public class LukeResponse extends SolrRe
flds = (NamedList<Object>) schema.get("fields");
}
if (flds != null) {
- fieldInfo = new HashMap<String, FieldInfo>();
+ fieldInfo = new HashMap<>();
for (Map.Entry<String, Object> field : flds) {
FieldInfo f = new FieldInfo(field.getKey());
f.read((NamedList<Object>) field.getValue());
@@ -213,7 +213,7 @@ public class LukeResponse extends SolrRe
if( schema != null ) {
NamedList<Object> fldTypes = (NamedList<Object>) schema.get("types");
if (fldTypes != null) {
- fieldTypeInfo = new HashMap<String, FieldTypeInfo>();
+ fieldTypeInfo = new HashMap<>();
for (Map.Entry<String, Object> fieldType : fldTypes) {
FieldTypeInfo ft = new FieldTypeInfo(fieldType.getKey());
ft.read((NamedList<Object>) fieldType.getValue());
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java Wed Mar 12 18:14:05 2014
@@ -158,7 +158,7 @@ public class QueryResponse extends SolrR
private void extractStatsInfo(NamedList<Object> info) {
if( info != null ) {
- _fieldStatsInfo = new HashMap<String, FieldStatsInfo>();
+ _fieldStatsInfo = new HashMap<>();
NamedList<NamedList<Object>> ff = (NamedList<NamedList<Object>>) info.get( "stats_fields" );
if( ff != null ) {
for( Map.Entry<String,NamedList<Object>> entry : ff ) {
@@ -174,13 +174,13 @@ public class QueryResponse extends SolrR
private void extractDebugInfo( NamedList<Object> debug )
{
- _debugMap = new LinkedHashMap<String, Object>(); // keep the order
+ _debugMap = new LinkedHashMap<>(); // keep the order
for( Map.Entry<String, Object> info : debug ) {
_debugMap.put( info.getKey(), info.getValue() );
}
// Parse out interesting bits from the debug info
- _explainMap = new HashMap<String, String>();
+ _explainMap = new HashMap<>();
NamedList<String> explain = (NamedList<String>)_debugMap.get( "explain" );
if( explain != null ) {
for( Map.Entry<String, String> info : explain ) {
@@ -246,9 +246,9 @@ public class QueryResponse extends SolrR
private void extractHighlightingInfo( NamedList<Object> info )
{
- _highlighting = new HashMap<String,Map<String,List<String>>>();
+ _highlighting = new HashMap<>();
for( Map.Entry<String, Object> doc : info ) {
- Map<String,List<String>> fieldMap = new HashMap<String, List<String>>();
+ Map<String,List<String>> fieldMap = new HashMap<>();
_highlighting.put( doc.getKey(), fieldMap );
NamedList<List<String>> fnl = (NamedList<List<String>>)doc.getValue();
@@ -261,7 +261,7 @@ public class QueryResponse extends SolrR
private void extractFacetInfo( NamedList<Object> info )
{
// Parse the queries
- _facetQuery = new LinkedHashMap<String, Integer>();
+ _facetQuery = new LinkedHashMap<>();
NamedList<Integer> fq = (NamedList<Integer>) info.get( "facet_queries" );
if (fq != null) {
for( Map.Entry<String, Integer> entry : fq ) {
@@ -273,8 +273,8 @@ public class QueryResponse extends SolrR
// TODO?? The list could be <int> or <long>? If always <long> then we can switch to <Long>
NamedList<NamedList<Number>> ff = (NamedList<NamedList<Number>>) info.get( "facet_fields" );
if( ff != null ) {
- _facetFields = new ArrayList<FacetField>( ff.size() );
- _limitingFacets = new ArrayList<FacetField>( ff.size() );
+ _facetFields = new ArrayList<>( ff.size() );
+ _limitingFacets = new ArrayList<>( ff.size() );
long minsize = _results == null ? Long.MAX_VALUE :_results.getNumFound();
for( Map.Entry<String,NamedList<Number>> facet : ff ) {
@@ -295,7 +295,7 @@ public class QueryResponse extends SolrR
NamedList<NamedList<Object>> df = (NamedList<NamedList<Object>>) info.get("facet_dates");
if (df != null) {
// System.out.println(df);
- _facetDates = new ArrayList<FacetField>( df.size() );
+ _facetDates = new ArrayList<>( df.size() );
for (Map.Entry<String, NamedList<Object>> facet : df) {
// System.out.println("Key: " + facet.getKey() + " Value: " + facet.getValue());
NamedList<Object> values = facet.getValue();
@@ -318,7 +318,7 @@ public class QueryResponse extends SolrR
//Parse range facets
NamedList<NamedList<Object>> rf = (NamedList<NamedList<Object>>) info.get("facet_ranges");
if (rf != null) {
- _facetRanges = new ArrayList<RangeFacet>( rf.size() );
+ _facetRanges = new ArrayList<>( rf.size() );
for (Map.Entry<String, NamedList<Object>> facet : rf) {
NamedList<Object> values = facet.getValue();
Object rawGap = values.get("gap");
@@ -358,7 +358,7 @@ public class QueryResponse extends SolrR
//Parse pivot facets
NamedList pf = (NamedList) info.get("facet_pivot");
if (pf != null) {
- _facetPivot = new NamedList<List<PivotField>>();
+ _facetPivot = new NamedList<>();
for( int i=0; i<pf.size(); i++ ) {
_facetPivot.add( pf.getName(i), readPivots( (List<NamedList>)pf.getVal(i) ) );
}
@@ -367,7 +367,7 @@ public class QueryResponse extends SolrR
protected List<PivotField> readPivots( List<NamedList> list )
{
- ArrayList<PivotField> values = new ArrayList<PivotField>( list.size() );
+ ArrayList<PivotField> values = new ArrayList<>( list.size() );
for( NamedList nl : list ) {
// NOTE, this is cheating, but we know the order they are written in, so no need to check
String f = (String)nl.getVal( 0 );
@@ -386,7 +386,7 @@ public class QueryResponse extends SolrR
* Remove the field facet info
*/
public void removeFacets() {
- _facetFields = new ArrayList<FacetField>();
+ _facetFields = new ArrayList<>();
}
//------------------------------------------------------
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java Wed Mar 12 18:14:05 2014
@@ -26,7 +26,7 @@ import java.util.List;
public abstract class RangeFacet<B, G> {
private final String name;
- private final List<Count> counts = new ArrayList<Count>();
+ private final List<Count> counts = new ArrayList<>();
private final B start;
private final B end;
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java Wed Mar 12 18:14:05 2014
@@ -32,8 +32,8 @@ import java.util.Map;
public class SpellCheckResponse {
private boolean correctlySpelled;
private List<Collation> collations;
- private List<Suggestion> suggestions = new ArrayList<Suggestion>();
- Map<String, Suggestion> suggestionMap = new LinkedHashMap<String, Suggestion>();
+ private List<Suggestion> suggestions = new ArrayList<>();
+ Map<String, Suggestion> suggestionMap = new LinkedHashMap<>();
public SpellCheckResponse(NamedList<NamedList<Object>> spellInfo) {
NamedList<Object> sugg = spellInfo.get("suggestions");
@@ -49,7 +49,7 @@ public class SpellCheckResponse {
//continue;
} else if ("collation".equals(n)) {
List<Object> collationInfo = sugg.getAll(n);
- collations = new ArrayList<Collation>(collationInfo.size());
+ collations = new ArrayList<>(collationInfo.size());
for (Object o : collationInfo) {
if (o instanceof String) {
collations.add(new Collation()
@@ -138,7 +138,7 @@ public class SpellCheckResponse {
private int startOffset;
private int endOffset;
private int originalFrequency;
- private List<String> alternatives = new ArrayList<String>();
+ private List<String> alternatives = new ArrayList<>();
private List<Integer> alternativeFrequencies;
public Suggestion(String token, NamedList<Object> suggestion) {
@@ -161,7 +161,7 @@ public class SpellCheckResponse {
// extended results detected
@SuppressWarnings("unchecked")
List<NamedList> extended = (List<NamedList>)list;
- alternativeFrequencies = new ArrayList<Integer>();
+ alternativeFrequencies = new ArrayList<>();
for (NamedList nl : extended) {
alternatives.add((String)nl.get("word"));
alternativeFrequencies.add((Integer)nl.get("freq"));
@@ -221,7 +221,7 @@ public class SpellCheckResponse {
public class Collation {
private String collationQueryString;
- private List<Correction> misspellingsAndCorrections = new ArrayList<Correction>();
+ private List<Correction> misspellingsAndCorrections = new ArrayList<>();
private long numberOfHits;
public long getNumberOfHits() {
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/TermsResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/TermsResponse.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/TermsResponse.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/response/TermsResponse.java Wed Mar 12 18:14:05 2014
@@ -27,12 +27,12 @@ import java.util.Map;
* Encapsulates responses from TermsComponent
*/
public class TermsResponse {
- private Map<String, List<Term>> termMap = new HashMap<String, List<Term>>();
+ private Map<String, List<Term>> termMap = new HashMap<>();
public TermsResponse(NamedList<NamedList<Number>> termsInfo) {
for (int i = 0; i < termsInfo.size(); i++) {
String fieldName = termsInfo.getName(i);
- List<Term> itemList = new ArrayList<Term>();
+ List<Term> itemList = new ArrayList<>();
NamedList<Number> items = termsInfo.getVal(i);
for (int j = 0; j < items.size(); j++) {
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java Wed Mar 12 18:14:05 2014
@@ -61,7 +61,7 @@ public class ClientUtils
if( str == null )
return null;
- ArrayList<ContentStream> streams = new ArrayList<ContentStream>( 1 );
+ ArrayList<ContentStream> streams = new ArrayList<>( 1 );
ContentStreamBase ccc = new ContentStreamBase.StringStream( str );
ccc.setContentType( contentType );
streams.add( ccc );
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java Wed Mar 12 18:14:05 2014
@@ -46,7 +46,7 @@ public class SolrDocument implements Map
public SolrDocument()
{
- _fields = new LinkedHashMap<String,Object>();
+ _fields = new LinkedHashMap<>();
}
/**
@@ -96,7 +96,7 @@ public class SolrDocument implements Map
// nothing
}
else if( value instanceof Iterable ) {
- ArrayList<Object> lst = new ArrayList<Object>();
+ ArrayList<Object> lst = new ArrayList<>();
for( Object o : (Iterable)value ) {
lst.add( o );
}
@@ -122,7 +122,7 @@ public class SolrDocument implements Map
Object existing = _fields.get(name);
if (existing == null) {
if( value instanceof Collection ) {
- Collection<Object> c = new ArrayList<Object>( 3 );
+ Collection<Object> c = new ArrayList<>( 3 );
for ( Object o : (Collection<Object>)value ) {
c.add(o);
}
@@ -138,7 +138,7 @@ public class SolrDocument implements Map
vals = (Collection<Object>)existing;
}
else {
- vals = new ArrayList<Object>( 3 );
+ vals = new ArrayList<>( 3 );
vals.add( existing );
}
@@ -193,7 +193,7 @@ public class SolrDocument implements Map
return (Collection<Object>)v;
}
if( v != null ) {
- ArrayList<Object> arr = new ArrayList<Object>(1);
+ ArrayList<Object> arr = new ArrayList<>(1);
arr.add( v );
return arr;
}
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java Wed Mar 12 18:14:05 2014
@@ -42,7 +42,7 @@ public class SolrInputDocument implement
private List<SolrInputDocument> _childDocuments;
public SolrInputDocument() {
- _fields = new LinkedHashMap<String,SolrInputField>();
+ _fields = new LinkedHashMap<>();
}
public SolrInputDocument(Map<String,SolrInputField> fields) {
@@ -208,7 +208,7 @@ public class SolrInputDocument implement
clone._documentBoost = _documentBoost;
if (_childDocuments != null) {
- clone._childDocuments = new ArrayList<SolrInputDocument>(_childDocuments.size());
+ clone._childDocuments = new ArrayList<>(_childDocuments.size());
for (SolrInputDocument child : _childDocuments) {
clone._childDocuments.add(child.deepCopy());
}
@@ -322,7 +322,7 @@ public class SolrInputDocument implement
public void addChildDocument(SolrInputDocument child) {
if (_childDocuments == null) {
- _childDocuments = new ArrayList<SolrInputDocument>();
+ _childDocuments = new ArrayList<>();
}
_childDocuments.add(child);
}