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 [24/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/core/TestJmxMonitoredMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java Wed Mar 12 14:39:17 2014
@@ -83,7 +83,7 @@ public class TestJmxMonitoredMap extends
AbstractSolrTestCase.log.info("Using port: " + port);
String url = "service:jmx:rmi:///jndi/rmi://127.0.0.1:"+port+"/solrjmx";
JmxConfiguration config = new JmxConfiguration(true, null, url, null);
- monitoredMap = new JmxMonitoredMap<String, SolrInfoMBean>("", "", config);
+ monitoredMap = new JmxMonitoredMap<>("", "", config);
JMXServiceURL u = new JMXServiceURL(url);
connector = JMXConnectorFactory.connect(u);
mbeanServer = connector.getMBeanServerConnection();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestLazyCores.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestLazyCores.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestLazyCores.java Wed Mar 12 14:39:17 2014
@@ -251,7 +251,7 @@ public class TestLazyCores extends SolrT
@Test
public void testRace() throws Exception {
- final List<SolrCore> theCores = new ArrayList<SolrCore>();
+ final List<SolrCore> theCores = new ArrayList<>();
final CoreContainer cc = init();
try {
@@ -713,9 +713,9 @@ public class TestLazyCores extends SolrT
}
NamedList.NamedListEntry[] entries = new NamedList.NamedListEntry[q.length / 2];
for (int i = 0; i < q.length; i += 2) {
- entries[i / 2] = new NamedList.NamedListEntry<String>(q[i], q[i + 1]);
+ entries[i / 2] = new NamedList.NamedListEntry<>(q[i], q[i + 1]);
}
- return new LocalSolrQueryRequest(core, new NamedList<Object>(entries));
+ return new LocalSolrQueryRequest(core, new NamedList<>(entries));
}
private final static String LOTS_SOLR_XML = " <solr persistent=\"false\"> " +
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java Wed Mar 12 14:39:17 2014
@@ -116,12 +116,12 @@ public class TestSolrXMLSerializer exten
String adminPathVal, String shareSchemaKey, String shareSchemaVal,
String instanceDirKey, String instanceDirVal) {
// <solr attrib="value">
- Map<String,String> rootSolrAttribs = new HashMap<String,String>();
+ Map<String,String> rootSolrAttribs = new HashMap<>();
rootSolrAttribs.put(sharedLibKey, sharedLibVal);
rootSolrAttribs.put(peristentKey, persistentVal);
// <solr attrib="value"> <cores attrib="value">
- Map<String,String> coresAttribs = new HashMap<String,String>();
+ Map<String,String> coresAttribs = new HashMap<>();
coresAttribs.put(adminPathKey, adminPathVal);
coresAttribs.put(shareSchemaKey, shareSchemaVal);
coresAttribs.put(defaultCoreNameKey, defaultCoreNameVal);
@@ -129,9 +129,9 @@ public class TestSolrXMLSerializer exten
SolrXMLDef solrXMLDef = new SolrXMLDef();
// <solr attrib="value"> <cores attrib="value"> <core attrib="value">
- List<SolrCoreXMLDef> solrCoreXMLDefs = new ArrayList<SolrCoreXMLDef>();
+ List<SolrCoreXMLDef> solrCoreXMLDefs = new ArrayList<>();
SolrCoreXMLDef coreDef = new SolrCoreXMLDef();
- Map<String,String> coreAttribs = new HashMap<String,String>();
+ Map<String,String> coreAttribs = new HashMap<>();
coreAttribs.put(instanceDirKey, instanceDirVal);
coreDef.coreAttribs = coreAttribs ;
coreDef.coreProperties = new Properties();
@@ -142,9 +142,9 @@ public class TestSolrXMLSerializer exten
solrXMLDef.containerProperties = containerProperties ;
solrXMLDef.solrAttribs = rootSolrAttribs;
solrXMLDef.coresAttribs = coresAttribs;
- solrXMLDef.loggingAttribs = new HashMap<String, String>();
- solrXMLDef.loggingAttribs = new HashMap<String, String>();
- solrXMLDef.watcherAttribs = new HashMap<String, String>();
+ solrXMLDef.loggingAttribs = new HashMap<>();
+ solrXMLDef.loggingAttribs = new HashMap<>();
+ solrXMLDef.watcherAttribs = new HashMap<>();
return solrXMLDef;
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java Wed Mar 12 14:39:17 2014
@@ -497,7 +497,7 @@ public class TestSolrXmlPersistence exte
private String[] getAllNodes(InputStream is) throws ParserConfigurationException, IOException, SAXException {
- List<String> expressions = new ArrayList<String>(); // XPATH and value for all elements in the indicated XML
+ List<String> expressions = new ArrayList<>(); // XPATH and value for all elements in the indicated XML
DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory
.newInstance();
DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java Wed Mar 12 14:39:17 2014
@@ -59,7 +59,7 @@ public class MoreLikeThisHandlerTest ext
// requires 'q' or single content stream
try {
- ArrayList<ContentStream> streams = new ArrayList<ContentStream>( 2 );
+ ArrayList<ContentStream> streams = new ArrayList<>( 2 );
streams.add( new ContentStreamBase.StringStream( "hello" ) );
streams.add( new ContentStreamBase.StringStream( "there" ) );
req.setContentStreams( streams );
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java Wed Mar 12 14:39:17 2014
@@ -52,7 +52,7 @@ public class StandardRequestHandlerTest
assertU(adoc("id", "12", "title", "test", "val_s1", "ccc"));
assertU(commit());
- Map<String,String> args = new HashMap<String, String>();
+ Map<String,String> args = new HashMap<>();
args.put( CommonParams.Q, "title:test" );
args.put( "indent", "true" );
SolrQueryRequest req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java Wed Mar 12 14:39:17 2014
@@ -93,7 +93,7 @@ public class TestCSVLoader extends SolrT
// TODO: stop using locally defined streams once stream.file and
// stream.body work everywhere
- List<ContentStream> cs = new ArrayList<ContentStream>(1);
+ List<ContentStream> cs = new ArrayList<>(1);
ContentStreamBase f = new ContentStreamBase.FileStream(new File(filename));
f.setContentType("text/csv");
cs.add(f);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java Wed Mar 12 14:39:17 2014
@@ -191,7 +191,7 @@ public class XmlUpdateRequestHandlerTest
private class MockUpdateRequestProcessor extends UpdateRequestProcessor {
- private Queue<DeleteUpdateCommand> deleteCommands = new LinkedList<DeleteUpdateCommand>();
+ private Queue<DeleteUpdateCommand> deleteCommands = new LinkedList<>();
public MockUpdateRequestProcessor(UpdateRequestProcessor next) {
super(next);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java Wed Mar 12 14:39:17 2014
@@ -68,12 +68,12 @@ public class XsltUpdateRequestHandlerTes
" </document>" +
"</random>";
- Map<String,String> args = new HashMap<String, String>();
+ Map<String,String> args = new HashMap<>();
args.put(CommonParams.TR, "xsl-update-handler-test.xsl");
SolrCore core = h.getCore();
LocalSolrQueryRequest req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
- ArrayList<ContentStream> streams = new ArrayList<ContentStream>();
+ ArrayList<ContentStream> streams = new ArrayList<>();
streams.add(new ContentStreamBase.StringStream(xml));
req.setContentStreams(streams);
SolrQueryResponse rsp = new SolrQueryResponse();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java Wed Mar 12 14:39:17 2014
@@ -43,7 +43,7 @@ public class MBeansHandlerTest extends S
"stats","true",
CommonParams.WT,"xml"
));
- List<ContentStream> streams = new ArrayList<ContentStream>();
+ List<ContentStream> streams = new ArrayList<>();
streams.add(new ContentStreamBase.StringStream(xml));
LocalSolrQueryRequest req = lrf.makeRequest(
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java Wed Mar 12 14:39:17 2014
@@ -31,13 +31,13 @@ public class SystemInfoHandlerTest exten
OperatingSystemMXBean os = ManagementFactory.getOperatingSystemMXBean();
// make one directly
- SimpleOrderedMap<Object> info = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> info = new SimpleOrderedMap<>();
info.add( "name", os.getName() );
info.add( "version", os.getVersion() );
info.add( "arch", os.getArch() );
// make another using addGetterIfAvaliable
- SimpleOrderedMap<Object> info2 = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> info2 = new SimpleOrderedMap<>();
SystemInfoHandler.addGetterIfAvaliable( os, "name", info2 );
SystemInfoHandler.addGetterIfAvaliable( os, "version", info2 );
SystemInfoHandler.addGetterIfAvaliable( os, "arch", info2 );
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java Wed Mar 12 14:39:17 2014
@@ -161,7 +161,7 @@ public class DebugComponentTest extends
@Test
public void testModifyRequestTrack() {
DebugComponent component = new DebugComponent();
- List<SearchComponent> components = new ArrayList<SearchComponent>(1);
+ List<SearchComponent> components = new ArrayList<>(1);
components.add(component);
for(int i = 0; i < 10; i++) {
SolrQueryRequest req = req("q", "test query", "distrib", "true", CommonParams.REQUEST_ID, "123456-my_rid");
@@ -196,7 +196,7 @@ public class DebugComponentTest extends
@Test
public void testPrepare() throws IOException {
DebugComponent component = new DebugComponent();
- List<SearchComponent> components = new ArrayList<SearchComponent>(1);
+ List<SearchComponent> components = new ArrayList<>(1);
components.add(component);
SolrQueryRequest req;
ResponseBuilder rb;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java Wed Mar 12 14:39:17 2014
@@ -187,7 +187,7 @@ public class DistributedSpellCheckCompon
collate, "true", maxCollationTries, "0", maxCollations, "1", collateExtended, "true"));
}
private Object[] buildRequest(String q, boolean useSpellcheckQ, String handlerName, boolean useGrouping, String... addlParams) {
- List<Object> params = new ArrayList<Object>();
+ List<Object> params = new ArrayList<>();
params.add("q");
params.add(useSpellcheckQ ? "*:*" : q);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java Wed Mar 12 14:39:17 2014
@@ -126,7 +126,7 @@ public class DistributedSuggestComponent
}
private Object[] buildRequest(String q, boolean useSuggestQ, String handlerName, String... addlParams) {
- List<Object> params = new ArrayList<Object>();
+ List<Object> params = new ArrayList<>();
if(useSuggestQ) {
params.add("suggest.q");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java Wed Mar 12 14:39:17 2014
@@ -54,7 +54,7 @@ public class DummyCustomParamSpellChecke
// sort the keys to make ordering predictable
Iterator<String> iterator = options.customParams.getParameterNamesIterator();
- List<String> lst = new ArrayList<String>();
+ List<String> lst = new ArrayList<>();
while (iterator.hasNext()) {
lst.add(iterator.next());
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java Wed Mar 12 14:39:17 2014
@@ -348,7 +348,7 @@ public class QueryElevationComponentTest
init("schema12.xml");
SolrCore core = h.getCore();
- NamedList<String> args = new NamedList<String>();
+ NamedList<String> args = new NamedList<>();
args.add(QueryElevationComponent.FIELD_TYPE, "string");
args.add(QueryElevationComponent.CONFIG_FILE, "elevate.xml");
@@ -371,7 +371,7 @@ public class QueryElevationComponentTest
assertEquals(null, map.get("zzzz"));
// Now test the same thing with a lowercase filter: 'lowerfilt'
- args = new NamedList<String>();
+ args = new NamedList<>();
args.add(QueryElevationComponent.FIELD_TYPE, "lowerfilt");
args.add(QueryElevationComponent.CONFIG_FILE, "elevate.xml");
@@ -535,7 +535,7 @@ public class QueryElevationComponentTest
String query = "title:ipod";
- Map<String, String> args = new HashMap<String, String>();
+ Map<String, String> args = new HashMap<>();
args.put(CommonParams.Q, query);
args.put(CommonParams.QT, "/elevate");
args.put(CommonParams.FL, "id,score");
@@ -699,7 +699,7 @@ public class QueryElevationComponentTest
writeFile(f, "aaa", "A");
QueryElevationComponent comp = (QueryElevationComponent) h.getCore().getSearchComponent("elevate");
- NamedList<String> args = new NamedList<String>();
+ NamedList<String> args = new NamedList<>();
args.add(QueryElevationComponent.CONFIG_FILE, testfile);
comp.init(args);
comp.inform(h.getCore());
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java Wed Mar 12 14:39:17 2014
@@ -43,7 +43,7 @@ public class SearchHandlerTest extends S
// Build an explicit list
//-----------------------------------------------
- List<String> names0 = new ArrayList<String>();
+ List<String> names0 = new ArrayList<>();
names0.add( MoreLikeThisComponent.COMPONENT_NAME );
NamedList args = new NamedList();
@@ -58,7 +58,7 @@ public class SearchHandlerTest extends S
// Build an explicit list that includes the debug comp.
//-----------------------------------------------
- names0 = new ArrayList<String>();
+ names0 = new ArrayList<>();
names0.add( FacetComponent.COMPONENT_NAME );
names0.add( DebugComponent.COMPONENT_NAME );
names0.add( MoreLikeThisComponent.COMPONENT_NAME );
@@ -80,10 +80,10 @@ public class SearchHandlerTest extends S
// First/Last list
//-----------------------------------------------
- names0 = new ArrayList<String>();
+ names0 = new ArrayList<>();
names0.add( MoreLikeThisComponent.COMPONENT_NAME );
- List<String> names1 = new ArrayList<String>();
+ List<String> names1 = new ArrayList<>();
names1.add( FacetComponent.COMPONENT_NAME );
args = new NamedList();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java Wed Mar 12 14:39:17 2014
@@ -166,7 +166,7 @@ public class StatsComponentTest extends
assertU(adoc("id", "4"));
assertU(commit());
- Map<String, String> args = new HashMap<String, String>();
+ Map<String, String> args = new HashMap<>();
args.put(CommonParams.Q, "*:*");
args.put(StatsParams.STATS, "true");
args.put(StatsParams.STATS_FIELD, "active_s");
@@ -197,7 +197,7 @@ public class StatsComponentTest extends
assertU(adoc("id", "3"));
assertU(commit());
- Map<String, String> args = new HashMap<String, String>();
+ Map<String, String> args = new HashMap<>();
args.put(CommonParams.Q, "*:*");
args.put(StatsParams.STATS, "true");
args.put(StatsParams.STATS_FIELD, "active_dt");
@@ -322,7 +322,7 @@ public class StatsComponentTest extends
assertU(adoc("id", "4"));
assertU(commit());
- Map<String, String> args = new HashMap<String, String>();
+ Map<String, String> args = new HashMap<>();
args.put(CommonParams.Q, "*:*");
args.put(StatsParams.STATS, "true");
args.put(StatsParams.STATS_FIELD, "active_i");
@@ -342,7 +342,7 @@ public class StatsComponentTest extends
assertU(adoc("id", "4"));
assertU(commit());
- Map<String, String> args = new HashMap<String, String>();
+ Map<String, String> args = new HashMap<>();
args.put(CommonParams.Q, "*:*");
args.put(StatsParams.STATS, "true");
args.put(StatsParams.STATS_FIELD, "active_s");
@@ -363,7 +363,7 @@ public class StatsComponentTest extends
assertU(adoc("id", "3"));
assertU(commit());
- Map<String, String> args = new HashMap<String, String>();
+ Map<String, String> args = new HashMap<>();
args.put(CommonParams.Q, "*:*");
args.put(StatsParams.STATS, "true");
args.put(StatsParams.STATS_FIELD, "active_dt");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java Wed Mar 12 14:39:17 2014
@@ -210,7 +210,7 @@ public class TermVectorComponentTest ext
);
// test each combination at random
- final List<String> list = new ArrayList<String>();
+ final List<String> list = new ArrayList<>();
list.addAll(Arrays.asList("json.nl","map", "qt",tv, "q", "id:0", TermVectorComponent.COMPONENT_NAME, "true"));
String[][] options = new String[][] { { TermVectorParams.TF, "'tf':1" },
{ TermVectorParams.OFFSETS, "'offsets':{'start':20, 'end':27}" },
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java Wed Mar 12 14:39:17 2014
@@ -67,7 +67,7 @@ public class FastVectorHighlighterTest e
@Test
public void test() {
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fl", "tv_text");
args.put("hl.snippets", "2");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java Wed Mar 12 14:39:17 2014
@@ -52,7 +52,7 @@ public class HighlighterConfigTest exten
assertTrue( highlighter instanceof DummyHighlighter );
// check to see that doHighlight is called from the DummyHighlighter
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("df", "t_text");
args.put("hl.fl", "");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java Wed Mar 12 14:39:17 2014
@@ -83,7 +83,7 @@ public class HighlighterTest extends Sol
@Test
public void testMergeContiguous() throws Exception {
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put(HighlightParams.HIGHLIGHT, "true");
args.put("df", "t_text");
args.put(HighlightParams.FIELDS, "");
@@ -132,7 +132,7 @@ public class HighlighterTest extends Sol
public void testTermVecHighlight() {
// do summarization using term vectors
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fl", "tv_text");
args.put("hl.snippets", "2");
@@ -154,7 +154,7 @@ public class HighlighterTest extends Sol
@Test
public void testTermVectorWithoutOffsetsHighlight() {
- HashMap<String,String> args = new HashMap<String, String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fl", "tv_no_off_text");
@@ -197,7 +197,7 @@ public class HighlighterTest extends Sol
public void testTermVecMultiValuedHighlight() throws Exception {
// do summarization using term vectors on multivalued field
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fl", "tv_mv_text");
args.put("hl.snippets", "2");
@@ -224,7 +224,7 @@ public class HighlighterTest extends Sol
public void testTermVecMultiValuedHighlight2() throws Exception {
// do summarization using term vectors on multivalued field
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fl", "tv_mv_text");
args.put("hl.snippets", "2");
@@ -249,7 +249,7 @@ public class HighlighterTest extends Sol
public void testDisMaxHighlight() {
// same test run through dismax handler
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fl", "tv_text");
args.put("qf", "tv_text");
@@ -277,7 +277,7 @@ public class HighlighterTest extends Sol
public void testMultiValueAnalysisHighlight() {
// do summarization using re-analysis of the field
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fl", "textgap");
args.put("df", "textgap");
@@ -299,7 +299,7 @@ public class HighlighterTest extends Sol
@Test
public void testMultiValueBestFragmentHighlight() {
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fl", "textgap");
args.put("df", "textgap");
@@ -338,7 +338,7 @@ public class HighlighterTest extends Sol
public void testDefaultFieldHighlight() {
// do summarization using re-analysis of the field
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("df", "t_text");
args.put("hl.fl", "");
@@ -361,7 +361,7 @@ public class HighlighterTest extends Sol
public void testHighlightDisabled() {
// ensure highlighting can be explicitly disabled
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "false");
args.put("hl.fl", "t_text");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
@@ -379,7 +379,7 @@ public class HighlighterTest extends Sol
public void testTwoFieldHighlight() {
// do summarization using re-analysis of the field
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fl", "t_text tv_text");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
@@ -405,7 +405,7 @@ public class HighlighterTest extends Sol
assertU(commit());
assertU(optimize());
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fl", "t_text1 t_text2");
@@ -449,7 +449,7 @@ public class HighlighterTest extends Sol
public void testCustomSimpleFormatterHighlight() {
// do summarization using a custom formatter
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fl", "t_text");
args.put("hl.simple.pre","<B>");
@@ -482,7 +482,7 @@ public class HighlighterTest extends Sol
@Test
public void testLongFragment() {
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fl", "tv_text");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
@@ -503,7 +503,7 @@ public class HighlighterTest extends Sol
@Test
public void testMaxChars() {
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("fl", "id score");
args.put("hl", "true");
args.put("hl.snippets", "10");
@@ -538,7 +538,7 @@ public class HighlighterTest extends Sol
@Test
public void testRegexFragmenter() {
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("fl", "id score");
args.put("hl", "true");
args.put("hl.snippets", "10");
@@ -585,7 +585,7 @@ public class HighlighterTest extends Sol
assertU(optimize());
// default length
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fl", "tv_text");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
@@ -628,7 +628,7 @@ public class HighlighterTest extends Sol
assertU(optimize());
// do summarization
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fragsize","0");
args.put("hl.fl", "t_text");
@@ -674,7 +674,7 @@ public class HighlighterTest extends Sol
@Test
public void testPhraseHighlighter() {
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("hl.fl", "t_text");
args.put("hl.fragsize", "40");
@@ -731,7 +731,7 @@ public class HighlighterTest extends Sol
@Test
public void testGetHighlightFields() {
- HashMap<String, String> args = new HashMap<String, String>();
+ HashMap<String, String> args = new HashMap<>();
args.put("fl", "id score");
args.put("hl", "true");
args.put("hl.fl", "t*");
@@ -776,7 +776,7 @@ public class HighlighterTest extends Sol
public void testDefaultFieldPrefixWildcardHighlight() {
// do summarization using re-analysis of the field
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("df", "t_text");
args.put("hl.fl", "");
@@ -800,7 +800,7 @@ public class HighlighterTest extends Sol
public void testDefaultFieldNonPrefixWildcardHighlight() {
// do summarization using re-analysis of the field
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put("hl", "true");
args.put("df", "t_text");
args.put("hl.fl", "");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java Wed Mar 12 14:39:17 2014
@@ -48,7 +48,7 @@ public class SimpleFacetsTest extends So
assertU(commit());
}
- static ArrayList<String[]> pendingDocs = new ArrayList<String[]>();
+ static ArrayList<String[]> pendingDocs = new ArrayList<>();
// committing randomly gives different looking segments each time
static void add_doc(String... fieldsAndValues) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestFaceting.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestFaceting.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestFaceting.java Wed Mar 12 14:39:17 2014
@@ -272,7 +272,7 @@ public class TestFaceting extends SolrTe
public void testTrieFields() {
// make sure that terms are correctly filtered even for trie fields that index several
// terms for a single value
- List<String> fields = new ArrayList<String>();
+ List<String> fields = new ArrayList<>();
fields.add("id");
fields.add("7");
final String[] suffixes = new String[] {"ti", "tis", "tf", "tfs", "tl", "tls", "td", "tds"};
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java Wed Mar 12 14:39:17 2014
@@ -67,7 +67,7 @@ public class TestWriterPerf extends Abst
void index(Object... olst) {
- ArrayList<String> lst = new ArrayList<String>();
+ ArrayList<String> lst = new ArrayList<>();
for (Object o : olst) lst.add(o.toString());
assertU(adoc(lst.toArray(new String[lst.size()])));
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java Wed Mar 12 14:39:17 2014
@@ -81,7 +81,7 @@ public class TestPHPSerializedResponseWr
// we use LinkedHashMap because we are doing a string comparison
// later and we need predictible ordering
- LinkedHashMap<String,String> nl = new LinkedHashMap<String,String>();
+ LinkedHashMap<String,String> nl = new LinkedHashMap<>();
nl.put("data4.1", "hashmap");
nl.put("data4.2", "hello");
d.addField("data4",nl);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java Wed Mar 12 14:39:17 2014
@@ -27,7 +27,7 @@ import java.util.TreeMap;
abstract public class SolrRestletTestBase extends RestTestBase {
@BeforeClass
public static void init() throws Exception {
- final SortedMap<ServletHolder,String> extraServlets = new TreeMap<ServletHolder,String>();
+ final SortedMap<ServletHolder,String> extraServlets = new TreeMap<>();
final ServletHolder solrRestApi = new ServletHolder("SolrRestApi", ServerServlet.class);
solrRestApi.setInitParameter("org.restlet.application", "org.apache.solr.rest.SolrRestApi");
extraServlets.put(solrRestApi, "/schema/*"); // '/schema/*' matches '/schema', '/schema/', and '/schema/whatever...'
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestClassNameShortening.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestClassNameShortening.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestClassNameShortening.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestClassNameShortening.java Wed Mar 12 14:39:17 2014
@@ -30,7 +30,7 @@ public class TestClassNameShortening ext
@BeforeClass
public static void init() throws Exception {
- final SortedMap<ServletHolder,String> extraServlets = new TreeMap<ServletHolder,String>();
+ final SortedMap<ServletHolder,String> extraServlets = new TreeMap<>();
final ServletHolder solrRestApi = new ServletHolder("SolrRestApi", ServerServlet.class);
solrRestApi.setInitParameter("org.restlet.application", "org.apache.solr.rest.SolrRestApi");
extraServlets.put(solrRestApi, "/schema/*"); // '/schema/*' matches '/schema', '/schema/', and '/schema/whatever...'
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java Wed Mar 12 14:39:17 2014
@@ -46,7 +46,7 @@ public class TestManagedSchemaFieldResou
tmpConfDir = new File(tmpSolrHome, confDir);
FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());
- final SortedMap<ServletHolder,String> extraServlets = new TreeMap<ServletHolder,String>();
+ final SortedMap<ServletHolder,String> extraServlets = new TreeMap<>();
final ServletHolder solrRestApi = new ServletHolder("SolrRestApi", ServerServlet.class);
solrRestApi.setInitParameter("org.restlet.application", "org.apache.solr.rest.SolrRestApi");
extraServlets.put(solrRestApi, "/schema/*"); // '/schema/*' matches '/schema', '/schema/', and '/schema/whatever...'
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java Wed Mar 12 14:39:17 2014
@@ -30,7 +30,7 @@ public class TestSerializedLuceneMatchVe
@BeforeClass
public static void init() throws Exception {
- final SortedMap<ServletHolder,String> extraServlets = new TreeMap<ServletHolder,String>();
+ final SortedMap<ServletHolder,String> extraServlets = new TreeMap<>();
final ServletHolder solrRestApi = new ServletHolder("SolrRestApi", ServerServlet.class);
solrRestApi.setInitParameter("org.restlet.application", "org.apache.solr.rest.SolrRestApi");
extraServlets.put(solrRestApi, "/schema/*"); // '/schema/*' matches '/schema', '/schema/', and '/schema/whatever...'
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java Wed Mar 12 14:39:17 2014
@@ -45,7 +45,7 @@ public class ChangedSchemaMergeTest exte
private void addDoc(SolrCore core, String... fieldValues) throws IOException {
UpdateHandler updater = core.getUpdateHandler();
- AddUpdateCommand cmd = new AddUpdateCommand(new LocalSolrQueryRequest(core, new NamedList<Object>()));
+ AddUpdateCommand cmd = new AddUpdateCommand(new LocalSolrQueryRequest(core, new NamedList<>()));
cmd.solrDoc = sdoc((Object[]) fieldValues);
updater.addDoc(cmd);
}
@@ -83,7 +83,7 @@ public class ChangedSchemaMergeTest exte
addDoc(changed, "id", "2", "which", "15", "text", "some stuff with which");
addDoc(changed, "id", "3", "which", "15", "text", "some stuff with which");
addDoc(changed, "id", "4", "which", "15", "text", "some stuff with which");
- SolrQueryRequest req = new LocalSolrQueryRequest(changed, new NamedList<Object>());
+ SolrQueryRequest req = new LocalSolrQueryRequest(changed, new NamedList<>());
changed.getUpdateHandler().commit(new CommitUpdateCommand(req, false));
// write the new schema out and make it current
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java Wed Mar 12 14:39:17 2014
@@ -128,7 +128,7 @@ public class CopyFieldTest extends SolrT
assertU(adoc("id", "10", "title", "test copy field", "text_en", "this is a simple test of the copy field functionality"));
assertU(commit());
- Map<String,String> args = new HashMap<String, String>();
+ Map<String,String> args = new HashMap<>();
args.put( CommonParams.Q, "text_en:simple" );
args.put( "indent", "true" );
SolrQueryRequest req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
@@ -138,7 +138,7 @@ public class CopyFieldTest extends SolrT
,"//result/doc[1]/int[@name='id'][.='10']"
);
- args = new HashMap<String, String>();
+ args = new HashMap<>();
args.put( CommonParams.Q, "highlight:simple" );
args.put( "indent", "true" );
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
@@ -148,14 +148,14 @@ public class CopyFieldTest extends SolrT
,"//result/doc[1]/arr[@name='highlight']/str[.='this is a simple test of ']"
);
- args = new HashMap<String, String>();
+ args = new HashMap<>();
args.put( CommonParams.Q, "text_en:functionality" );
args.put( "indent", "true" );
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
assertQ("Make sure they got in", req
,"//*[@numFound='1']");
- args = new HashMap<String, String>();
+ args = new HashMap<>();
args.put( CommonParams.Q, "highlight:functionality" );
args.put( "indent", "true" );
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
@@ -189,7 +189,7 @@ public class CopyFieldTest extends SolrT
assertU(adoc("id", "A5", "sku1", "10-1839ACX-93", "sku2", "AAM46"));
assertU(commit());
- Map<String,String> args = new HashMap<String, String>();
+ Map<String,String> args = new HashMap<>();
args.put( CommonParams.Q, "text:AAM46" );
args.put( "indent", "true" );
SolrQueryRequest req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
@@ -198,7 +198,7 @@ public class CopyFieldTest extends SolrT
,"//result/doc[1]/str[@name='id'][.='A5']"
);
- args = new HashMap<String, String>();
+ args = new HashMap<>();
args.put( CommonParams.Q, "1_s:10-1839ACX-93" );
args.put( "indent", "true" );
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
@@ -208,14 +208,14 @@ public class CopyFieldTest extends SolrT
,"//result/doc[1]/arr[@name='sku1']/str[.='10-1839ACX-93']"
);
- args = new HashMap<String, String>();
+ args = new HashMap<>();
args.put( CommonParams.Q, "1_dest_sub_s:10-1839ACX-93" );
args.put( "indent", "true" );
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
assertQ("sku1 copied to *_dest_sub_s (*_s subset pattern)", req
,"//*[@numFound='1']");
- args = new HashMap<String, String>();
+ args = new HashMap<>();
args.put( CommonParams.Q, "dest_sub_no_ast_s:AAM46" );
args.put( "indent", "true" );
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
@@ -237,7 +237,7 @@ public class CopyFieldTest extends SolrT
assertU(adoc("id", "A5", "sku1", "10-1839ACX-93", "testing123_s", "AAM46"));
assertU(commit());
- Map<String,String> args = new HashMap<String, String>();
+ Map<String,String> args = new HashMap<>();
args.put( CommonParams.Q, "text:AAM46" );
args.put( "indent", "true" );
SolrQueryRequest req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java Wed Mar 12 14:39:17 2014
@@ -48,7 +48,7 @@ public class IndexSchemaTest extends Sol
assertU(adoc("id", "10", "title", "test", "aaa_dynamic", "aaa"));
assertU(commit());
- Map<String,String> args = new HashMap<String, String>();
+ Map<String,String> args = new HashMap<>();
args.put( CommonParams.Q, "title:test" );
args.put( "indent", "true" );
SolrQueryRequest req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
@@ -58,7 +58,7 @@ public class IndexSchemaTest extends Sol
,"//result/doc[1]/int[@name='id'][.='10']"
);
- args = new HashMap<String, String>();
+ args = new HashMap<>();
args.put( CommonParams.Q, "aaa_dynamic:aaa" );
args.put( "indent", "true" );
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
@@ -67,7 +67,7 @@ public class IndexSchemaTest extends Sol
,"//result/doc[1]/int[@name='id'][.='10']"
);
- args = new HashMap<String, String>();
+ args = new HashMap<>();
args.put( CommonParams.Q, "dynamic_aaa:aaa" );
args.put( "indent", "true" );
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java Wed Mar 12 14:39:17 2014
@@ -29,7 +29,7 @@ import org.apache.solr.common.SolrExcept
* Simple mock provider with fixed rates and some assertions
*/
public class MockExchangeRateProvider implements ExchangeRateProvider {
- private static Map<String,Double> map = new HashMap<String,Double>();
+ private static Map<String,Double> map = new HashMap<>();
static {
map.put("USD,EUR", 0.8);
map.put("EUR,USD", 1.2);
@@ -59,7 +59,7 @@ public class MockExchangeRateProvider im
Set<String> currenciesPairs = map.keySet();
Set<String> returnSet;
- returnSet = new HashSet<String>();
+ returnSet = new HashSet<>();
for (String c : currenciesPairs) {
String[] pairs = c.split(",");
returnSet.add(pairs[0]);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java Wed Mar 12 14:39:17 2014
@@ -82,7 +82,7 @@ public class ModifyConfFileTest extends
core.execute(handler, new LocalSolrQueryRequest(core, params), rsp);
assertEquals(rsp.getException().getMessage(), "No file name specified for write operation.");
- ArrayList<ContentStream> streams = new ArrayList<ContentStream>( 2 );
+ ArrayList<ContentStream> streams = new ArrayList<>( 2 );
streams.add(new ContentStreamBase.StringStream("Testing rewrite of schema.xml file." ) );
params = params("op", "write", "file", "bogus.txt");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java Wed Mar 12 14:39:17 2014
@@ -34,7 +34,7 @@ public class OpenExchangeRatesOrgProvide
OpenExchangeRatesOrgProvider oerp;
ResourceLoader loader;
- private final Map<String,String> mockParams = new HashMap<String,String>();
+ private final Map<String,String> mockParams = new HashMap<>();
@Override
@@ -59,7 +59,7 @@ public class OpenExchangeRatesOrgProvide
"open-exchange-rates.json", oerp.ratesFileLocation);
assertEquals("Wrong default interval", (1440*60), oerp.refreshIntervalSeconds);
- Map<String,String> params = new HashMap<String,String>();
+ Map<String,String> params = new HashMap<>();
params.put(OpenExchangeRatesOrgProvider.PARAM_RATES_FILE_LOCATION,
"http://foo.bar/baz");
params.put(OpenExchangeRatesOrgProvider.PARAM_REFRESH_INTERVAL, "100");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java Wed Mar 12 14:39:17 2014
@@ -85,7 +85,7 @@ public class PreAnalyzedFieldTest extend
public void testValidSimple() {
PreAnalyzedField paf = new PreAnalyzedField();
// use Simple format
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put(PreAnalyzedField.PARSER_IMPL, SimplePreAnalyzedParser.class.getName());
paf.init(h.getCore().getLatestSchema(), args);
PreAnalyzedParser parser = new SimplePreAnalyzedParser();
@@ -128,7 +128,7 @@ public class PreAnalyzedFieldTest extend
public void testParsers() {
PreAnalyzedField paf = new PreAnalyzedField();
// use Simple format
- HashMap<String,String> args = new HashMap<String,String>();
+ HashMap<String,String> args = new HashMap<>();
args.put(PreAnalyzedField.PARSER_IMPL, SimplePreAnalyzedParser.class.getName());
paf.init(h.getCore().getLatestSchema(), args);
try {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java Wed Mar 12 14:39:17 2014
@@ -45,7 +45,7 @@ public class PrimitiveFieldTypeTest exte
System.setProperty("solr.test.sys.prop2", "proptwo");
System.setProperty("solr.allow.unsafe.resourceloading", "true");
- initMap = new HashMap<String,String>();
+ initMap = new HashMap<>();
config = new SolrConfig(new SolrResourceLoader("solr/collection1"), testConfHome + "solrconfig.xml", null);
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/SortableBinaryField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/SortableBinaryField.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/SortableBinaryField.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/SortableBinaryField.java Wed Mar 12 14:39:17 2014
@@ -45,7 +45,7 @@ public class SortableBinaryField extends
@Override
public List<StorableField> createFields(SchemaField field, Object value, float boost) {
if (field.hasDocValues()) {
- List<StorableField> fields = new ArrayList<StorableField>();
+ List<StorableField> fields = new ArrayList<>();
StorableField storedField = createField(field, value, boost);
fields.add(storedField);
ByteBuffer byteBuffer = toObject(storedField);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaAddField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaAddField.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaAddField.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaAddField.java Wed Mar 12 14:39:17 2014
@@ -57,14 +57,14 @@ public class TestCloudManagedSchemaAddFi
@Override
public SortedMap<ServletHolder,String> getExtraServlets() {
- final SortedMap<ServletHolder,String> extraServlets = new TreeMap<ServletHolder,String>();
+ final SortedMap<ServletHolder,String> extraServlets = new TreeMap<>();
final ServletHolder solrRestApi = new ServletHolder("SolrRestApi", ServerServlet.class);
solrRestApi.setInitParameter("org.restlet.application", "org.apache.solr.rest.SolrRestApi");
extraServlets.put(solrRestApi, "/schema/*"); // '/schema/*' matches '/schema', '/schema/', and '/schema/whatever...'
return extraServlets;
}
- private List<RestTestHarness> restTestHarnesses = new ArrayList<RestTestHarness>();
+ private List<RestTestHarness> restTestHarnesses = new ArrayList<>();
private void setupHarnesses() {
for (int i = 0 ; i < clients.size() ; ++i) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java Wed Mar 12 14:39:17 2014
@@ -176,7 +176,7 @@ public class TestManagedSchema extends A
String managedSchemaContents = FileUtils.readFileToString(managedSchemaFile, "UTF-8");
assertFalse(managedSchemaContents.contains("\"new_field\""));
- Map<String,Object> options = new HashMap<String,Object>();
+ Map<String,Object> options = new HashMap<>();
options.put("stored", "false");
IndexSchema oldSchema = h.getCore().getLatestSchema();
String fieldName = "new_field";
@@ -225,7 +225,7 @@ public class TestManagedSchema extends A
assertU(commit());
assertQ(req("new_field:thing1"), "//*[@numFound='0']");
- Map<String,Object> options = new HashMap<String,Object>();
+ Map<String,Object> options = new HashMap<>();
options.put("stored", "false");
IndexSchema oldSchema = h.getCore().getLatestSchema();
String fieldName = "new_field";
@@ -252,7 +252,7 @@ public class TestManagedSchema extends A
String errString = "Field 'str' already exists.";
ignoreException(Pattern.quote(errString));
try {
- Map<String,Object> options = new HashMap<String,Object>();
+ Map<String,Object> options = new HashMap<>();
IndexSchema oldSchema = h.getCore().getLatestSchema();
String fieldName = "str";
String fieldType = "string";
@@ -280,7 +280,7 @@ public class TestManagedSchema extends A
System.setProperty("managed.schema.mutable", "true");
initCore("solrconfig-managed-schema.xml", "schema-one-field-no-dynamic-field.xml", tmpSolrHome.getPath());
- Map<String,Object> options = new HashMap<String,Object>();
+ Map<String,Object> options = new HashMap<>();
options.put("stored", "false");
IndexSchema oldSchema = h.getCore().getLatestSchema();
String fieldName = "new_field";
@@ -320,7 +320,7 @@ public class TestManagedSchema extends A
String errString = "Can't add dynamic field '*_s'.";
ignoreException(Pattern.quote(errString));
try {
- Map<String,Object> options = new HashMap<String,Object>();
+ Map<String,Object> options = new HashMap<>();
IndexSchema oldSchema = h.getCore().getLatestSchema();
String fieldName = "*_s";
String fieldType = "string";
@@ -356,7 +356,7 @@ public class TestManagedSchema extends A
assertNull("Field '" + fieldName + "' is present in the schema",
h.getCore().getLatestSchema().getFieldOrNull(fieldName));
- Map<String,Object> options = new HashMap<String,Object>();
+ Map<String,Object> options = new HashMap<>();
IndexSchema oldSchema = h.getCore().getLatestSchema();
String fieldType = "string_disk";
SchemaField newField = oldSchema.newField(fieldName, fieldType, options);
@@ -384,7 +384,7 @@ public class TestManagedSchema extends A
assertNull("Field '" + fieldName + "' is present in the schema",
h.getCore().getLatestSchema().getFieldOrNull(fieldName));
- Map<String,Object> options = new HashMap<String,Object>();
+ Map<String,Object> options = new HashMap<>();
IndexSchema oldSchema = h.getCore().getLatestSchema();
String fieldType = "text";
SchemaField newField = oldSchema.newField(fieldName, fieldType, options);
@@ -409,7 +409,7 @@ public class TestManagedSchema extends A
String managedSchemaContents = FileUtils.readFileToString(managedSchemaFile, "UTF-8");
assertFalse(managedSchemaContents.contains("\"new_field\""));
- Map<String,Object> options = new HashMap<String,Object>();
+ Map<String,Object> options = new HashMap<>();
options.put("stored", "false");
IndexSchema oldSchema = h.getCore().getLatestSchema();
assertEquals("str", oldSchema.getUniqueKeyField().getName());
@@ -445,7 +445,7 @@ public class TestManagedSchema extends A
assertNull("Field '" + fieldName + "' is present in the schema",
h.getCore().getLatestSchema().getFieldOrNull(fieldName));
- Map<String,Object> options = new HashMap<String,Object>();
+ Map<String,Object> options = new HashMap<>();
IndexSchema oldSchema = h.getCore().getLatestSchema();
String fieldType = "text";
SchemaField newField = oldSchema.newField(fieldName, fieldType, options);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java Wed Mar 12 14:39:17 2014
@@ -248,7 +248,7 @@ public class CursorMarkTest extends Solr
* a list of the fields in the schema - excluding _version_
*/
private Collection<String> getAllFieldNames() {
- ArrayList<String> names = new ArrayList<String>(37);
+ ArrayList<String> names = new ArrayList<>(37);
for (String f : h.getCore().getLatestSchema().getFields().keySet()) {
if (! f.equals("_version_")) {
names.add(f);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java Wed Mar 12 14:39:17 2014
@@ -71,9 +71,9 @@ public class QueryEqualityTest extends S
/** @see #testParserCoverage */
private static boolean doAssertParserCoverage = false;
/** @see #testParserCoverage */
- private static final Set<String> qParsersTested = new HashSet<String>();
+ private static final Set<String> qParsersTested = new HashSet<>();
/** @see #testParserCoverage */
- private static final Set<String> valParsersTested = new HashSet<String>();
+ private static final Set<String> valParsersTested = new HashSet<>();
public void testDateMathParsingEquality() throws Exception {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java Wed Mar 12 14:39:17 2014
@@ -1146,7 +1146,7 @@ public class TestExtendedDismaxParser ex
public FuzzyQueryParser(QParser parser, String defaultField) {
super(parser, defaultField);
- frequentlyMisspelledWords = new HashSet<String>();
+ frequentlyMisspelledWords = new HashSet<>();
frequentlyMisspelledWords.add("absence");
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java Wed Mar 12 14:39:17 2014
@@ -38,8 +38,8 @@ import java.util.concurrent.atomic.Atomi
public class TestFastLRUCache extends LuceneTestCase {
public void testPercentageAutowarm() throws IOException {
- FastLRUCache<Object, Object> fastCache = new FastLRUCache<Object, Object>();
- Map<String, String> params = new HashMap<String, String>();
+ FastLRUCache<Object, Object> fastCache = new FastLRUCache<>();
+ Map<String, String> params = new HashMap<>();
params.put("size", "100");
params.put("initialSize", "10");
params.put("autowarmCount", "100%");
@@ -56,7 +56,7 @@ public class TestFastLRUCache extends Lu
assertEquals(1L, nl.get("hits"));
assertEquals(101L, nl.get("inserts"));
assertEquals(null, fastCache.get(1)); // first item put in should be the first out
- FastLRUCache<Object, Object> fastCacheNew = new FastLRUCache<Object, Object>();
+ FastLRUCache<Object, Object> fastCacheNew = new FastLRUCache<>();
fastCacheNew.init(params, o, cr);
fastCacheNew.warm(null, fastCache);
fastCacheNew.setState(SolrCache.State.LIVE);
@@ -84,8 +84,8 @@ public class TestFastLRUCache extends Lu
}
private void doTestPercentageAutowarm(int limit, int percentage, int[] hits, int[]misses) {
- FastLRUCache<Object, Object> fastCache = new FastLRUCache<Object, Object>();
- Map<String, String> params = new HashMap<String, String>();
+ FastLRUCache<Object, Object> fastCache = new FastLRUCache<>();
+ Map<String, String> params = new HashMap<>();
params.put("size", String.valueOf(limit));
params.put("initialSize", "10");
params.put("autowarmCount", percentage + "%");
@@ -96,7 +96,7 @@ public class TestFastLRUCache extends Lu
fastCache.put(i, "" + i);//adds numbers from 1 to 100
}
- FastLRUCache<Object, Object> fastCacheNew = new FastLRUCache<Object, Object>();
+ FastLRUCache<Object, Object> fastCacheNew = new FastLRUCache<>();
fastCacheNew.init(params, o, cr);
fastCacheNew.warm(null, fastCache);
fastCacheNew.setState(SolrCache.State.LIVE);
@@ -116,8 +116,8 @@ public class TestFastLRUCache extends Lu
}
public void testNoAutowarm() throws IOException {
- FastLRUCache<Object, Object> fastCache = new FastLRUCache<Object, Object>();
- Map<String, String> params = new HashMap<String, String>();
+ FastLRUCache<Object, Object> fastCache = new FastLRUCache<>();
+ Map<String, String> params = new HashMap<>();
params.put("size", "100");
params.put("initialSize", "10");
CacheRegenerator cr = new NoOpRegenerator();
@@ -133,7 +133,7 @@ public class TestFastLRUCache extends Lu
assertEquals(1L, nl.get("hits"));
assertEquals(101L, nl.get("inserts"));
assertEquals(null, fastCache.get(1)); // first item put in should be the first out
- FastLRUCache<Object, Object> fastCacheNew = new FastLRUCache<Object, Object>();
+ FastLRUCache<Object, Object> fastCacheNew = new FastLRUCache<>();
fastCacheNew.init(params, o, cr);
fastCacheNew.warm(null, fastCache);
fastCacheNew.setState(SolrCache.State.LIVE);
@@ -145,8 +145,8 @@ public class TestFastLRUCache extends Lu
}
public void testFullAutowarm() throws IOException {
- FastLRUCache<Object, Object> cache = new FastLRUCache<Object, Object>();
- Map<Object, Object> params = new HashMap<Object, Object>();
+ FastLRUCache<Object, Object> cache = new FastLRUCache<>();
+ Map<Object, Object> params = new HashMap<>();
params.put("size", "100");
params.put("initialSize", "10");
params.put("autowarmCount", "-1");
@@ -162,7 +162,7 @@ public class TestFastLRUCache extends Lu
assertEquals(null, cache.get(1)); // first item put in should be the first out
- FastLRUCache<Object, Object> cacheNew = new FastLRUCache<Object, Object>();
+ FastLRUCache<Object, Object> cacheNew = new FastLRUCache<>();
cacheNew.init(params, o, cr);
cacheNew.warm(null, cache);
cacheNew.setState(SolrCache.State.LIVE);
@@ -217,7 +217,7 @@ public class TestFastLRUCache extends Lu
}
public void testOldestItems() {
- ConcurrentLRUCache<Integer, String> cache = new ConcurrentLRUCache<Integer, String>(100, 90);
+ ConcurrentLRUCache<Integer, String> cache = new ConcurrentLRUCache<>(100, 90);
for (int i = 0; i < 50; i++) {
cache.put(i + 1, "" + (i + 1));
}
@@ -246,7 +246,7 @@ public class TestFastLRUCache extends Lu
int sz = random().nextInt(100)+5;
int lowWaterMark = random().nextInt(sz-3)+1;
int keyrange = random().nextInt(sz*3)+1;
- ConcurrentLRUCache<Integer, String> cache = new ConcurrentLRUCache<Integer, String>(sz, lowWaterMark);
+ ConcurrentLRUCache<Integer, String> cache = new ConcurrentLRUCache<>(sz, lowWaterMark);
for (int i=0; i<10000; i++) {
cache.put(random().nextInt(keyrange), "");
cache.get(random().nextInt(keyrange));
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFiltering.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFiltering.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFiltering.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFiltering.java Wed Mar 12 14:39:17 2014
@@ -271,7 +271,7 @@ public class TestFiltering extends SolrT
int nonZeros=0;
for (int qiter=0; qiter<queryIter; qiter++) {
model.clear();
- List<String> params = new ArrayList<String>();
+ List<String> params = new ArrayList<>();
params.add("q"); params.add(makeRandomQuery(model, true, false));
int nFilters = random().nextInt(5);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLFUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLFUCache.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLFUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLFUCache.java Wed Mar 12 14:39:17 2014
@@ -186,7 +186,7 @@ public class TestLFUCache extends SolrTe
@Test
public void testItemOrdering() {
- ConcurrentLFUCache<Integer, String> cache = new ConcurrentLFUCache<Integer, String>(100, 90);
+ ConcurrentLFUCache<Integer, String> cache = new ConcurrentLFUCache<>(100, 90);
try {
for (int i = 0; i < 50; i++) {
cache.put(i + 1, "" + (i + 1));
@@ -252,7 +252,7 @@ public class TestLFUCache extends SolrTe
@Test
public void testTimeDecay() {
- ConcurrentLFUCache<Integer, String> cacheDecay = new ConcurrentLFUCache<Integer, String>(10, 9);
+ ConcurrentLFUCache<Integer, String> cacheDecay = new ConcurrentLFUCache<>(10, 9);
try {
for (int i = 1; i < 21; i++) {
cacheDecay.put(i, Integer.toString(i));
@@ -326,7 +326,7 @@ public class TestLFUCache extends SolrTe
@Test
public void testTimeNoDecay() {
- ConcurrentLFUCache<Integer, String> cacheNoDecay = new ConcurrentLFUCache<Integer, String>(10, 9,
+ ConcurrentLFUCache<Integer, String> cacheNoDecay = new ConcurrentLFUCache<>(10, 9,
(int) Math.floor((9 + 10) / 2), (int) Math.ceil(0.75 * 10), false, false, null, false);
try {
for (int i = 1; i < 21; i++) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLRUCache.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLRUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLRUCache.java Wed Mar 12 14:39:17 2014
@@ -31,8 +31,8 @@ import org.apache.solr.common.util.Named
public class TestLRUCache extends LuceneTestCase {
public void testFullAutowarm() throws IOException {
- LRUCache<Object, Object> lruCache = new LRUCache<Object, Object>();
- Map<String, String> params = new HashMap<String, String>();
+ LRUCache<Object, Object> lruCache = new LRUCache<>();
+ Map<String, String> params = new HashMap<>();
params.put("size", "100");
params.put("initialSize", "10");
params.put("autowarmCount", "100%");
@@ -45,7 +45,7 @@ public class TestLRUCache extends Lucene
assertEquals("25", lruCache.get(25));
assertEquals(null, lruCache.get(110));
assertEquals(null, lruCache.get(1)); // first item put in should be the first out
- LRUCache<Object, Object> lruCacheNew = new LRUCache<Object, Object>();
+ LRUCache<Object, Object> lruCacheNew = new LRUCache<>();
lruCacheNew.init(params, o, cr);
lruCacheNew.warm(null, lruCache);
lruCacheNew.setState(SolrCache.State.LIVE);
@@ -64,8 +64,8 @@ public class TestLRUCache extends Lucene
}
private void doTestPercentageAutowarm(int limit, int percentage, int[] hits, int[]misses) {
- LRUCache<Object, Object> lruCache = new LRUCache<Object, Object>();
- Map<String, String> params = new HashMap<String, String>();
+ LRUCache<Object, Object> lruCache = new LRUCache<>();
+ Map<String, String> params = new HashMap<>();
params.put("size", String.valueOf(limit));
params.put("initialSize", "10");
params.put("autowarmCount", percentage + "%");
@@ -76,7 +76,7 @@ public class TestLRUCache extends Lucene
lruCache.put(i, "" + i);//adds numbers from 1 to 100
}
- LRUCache<Object, Object> lruCacheNew = new LRUCache<Object, Object>();
+ LRUCache<Object, Object> lruCacheNew = new LRUCache<>();
lruCacheNew.init(params, o, cr);
lruCacheNew.warm(null, lruCache);
lruCacheNew.setState(SolrCache.State.LIVE);
@@ -94,8 +94,8 @@ public class TestLRUCache extends Lucene
@SuppressWarnings("unchecked")
public void testNoAutowarm() throws IOException {
- LRUCache<Object, Object> lruCache = new LRUCache<Object, Object>();
- Map<String, String> params = new HashMap<String, String>();
+ LRUCache<Object, Object> lruCache = new LRUCache<>();
+ Map<String, String> params = new HashMap<>();
params.put("size", "100");
params.put("initialSize", "10");
CacheRegenerator cr = new NoOpRegenerator();
@@ -111,7 +111,7 @@ public class TestLRUCache extends Lucene
assertEquals(1L, nl.get("hits"));
assertEquals(101L, nl.get("inserts"));
assertEquals(null, lruCache.get(1)); // first item put in should be the first out
- LRUCache<Object, Object> lruCacheNew = new LRUCache<Object, Object>();
+ LRUCache<Object, Object> lruCacheNew = new LRUCache<>();
lruCacheNew.init(params, o, cr);
lruCacheNew.warm(null, lruCache);
lruCacheNew.setState(SolrCache.State.LIVE);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java Wed Mar 12 14:39:17 2014
@@ -135,7 +135,7 @@ public class TestMaxScoreQueryParser ext
private Query parse(String q, String... params) {
try {
ModifiableSolrParams p = new ModifiableSolrParams();
- ArrayList<String> al = new ArrayList<String>(Arrays.asList(params));
+ ArrayList<String> al = new ArrayList<>(Arrays.asList(params));
while(al.size() >= 2) {
p.add(al.remove(0), al.remove(0));
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java Wed Mar 12 14:39:17 2014
@@ -471,7 +471,7 @@ public class TestPseudoReturnFields exte
,"//result/doc[count(*)=6]"
);
- final List<String> params = new ArrayList<String>((fl.size()*2) + 4);
+ final List<String> params = new ArrayList<>((fl.size()*2) + 4);
final StringBuilder info = new StringBuilder();
params.addAll(Arrays.asList("q","*:*", "rows", "1"));
for (String item : fl) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRTGBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRTGBase.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRTGBase.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRTGBase.java Wed Mar 12 14:39:17 2014
@@ -55,8 +55,8 @@ public class TestRTGBase extends SolrTes
}
}
- protected final ConcurrentHashMap<Integer,DocInfo> model = new ConcurrentHashMap<Integer,DocInfo>();
- protected Map<Integer,DocInfo> committedModel = new HashMap<Integer,DocInfo>();
+ protected final ConcurrentHashMap<Integer,DocInfo> model = new ConcurrentHashMap<>();
+ protected Map<Integer,DocInfo> committedModel = new HashMap<>();
protected long snapshotCount;
protected long committedModelClock;
protected volatile int lastId;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java Wed Mar 12 14:39:17 2014
@@ -88,7 +88,7 @@ public class TestRangeQuery extends Solr
String[] dates = {"0299-12-31T23:59:59.999Z","2000-01-01T00:00:00.000Z","2000-01-01T00:00:00.001Z", "0299-12-31T23:59:59.998Z","2000-01-01T00:00:00.002Z" };
// fields that normal range queries should work on
- Map<String,String[]> norm_fields = new HashMap<String,String[]>();
+ Map<String,String[]> norm_fields = new HashMap<>();
norm_fields.put("foo_i", ints);
norm_fields.put("foo_l", longs);
norm_fields.put("foo_d", doubles);
@@ -103,7 +103,7 @@ public class TestRangeQuery extends Solr
// fields that frange queries should work on
- Map<String,String[]> frange_fields = new HashMap<String,String[]>();
+ Map<String,String[]> frange_fields = new HashMap<>();
frange_fields.put("foo_i", ints);
frange_fields.put("foo_l", longs);
frange_fields.put("foo_d", doubles);
@@ -120,12 +120,12 @@ public class TestRangeQuery extends Solr
frange_fields.put("foo_s", strings);
frange_fields.put("foo_dt", dates);
- Map<String,String[]> all_fields = new HashMap<String,String[]>();
+ Map<String,String[]> all_fields = new HashMap<>();
all_fields.putAll(norm_fields);
all_fields.putAll(frange_fields);
for (int j=0; j<ints.length-2; j++) {
- List<String> fields = new ArrayList<String>();
+ List<String> fields = new ArrayList<>();
fields.add("id");
fields.add(""+j);
for (Map.Entry<String,String[]> entry : all_fields.entrySet()) {
@@ -239,7 +239,7 @@ public class TestRangeQuery extends Solr
// lower=2; upper=2; inclusive=true;
// inclusive=true; lowerMissing=true; upperMissing=true;
- List<String> qs = new ArrayList<String>();
+ List<String> qs = new ArrayList<>();
for (String field : norm_fields) {
String q = field + ':' + (inclusive?'[':'{')
+ (lowerMissing?"*":lower)
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java Wed Mar 12 14:39:17 2014
@@ -438,7 +438,7 @@ public class TestRealTimeGet extends Tes
final AtomicInteger numCommitting = new AtomicInteger();
- List<Thread> threads = new ArrayList<Thread>();
+ List<Thread> threads = new ArrayList<>();
for (int i=0; i<nWriteThreads; i++) {
Thread thread = new Thread("WRITER"+i) {
@@ -456,7 +456,7 @@ public class TestRealTimeGet extends Tes
long version;
synchronized(TestRealTimeGet.this) {
- newCommittedModel = new HashMap<Integer,DocInfo>(model); // take a snapshot
+ newCommittedModel = new HashMap<>(model); // take a snapshot
version = snapshotCount++;
verbose("took snapshot version=",version);
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java Wed Mar 12 14:39:17 2014
@@ -124,7 +124,7 @@ public class TestRecovery extends SolrTe
clearIndex();
assertU(commit());
- Deque<Long> versions = new ArrayDeque<Long>();
+ Deque<Long> versions = new ArrayDeque<>();
versions.addFirst(addAndGetVersion(sdoc("id", "A1"), null));
versions.addFirst(addAndGetVersion(sdoc("id", "A11"), null));
versions.addFirst(addAndGetVersion(sdoc("id", "A12"), null));
@@ -771,7 +771,7 @@ public class TestRecovery extends SolrTe
int start = 0;
int maxReq = 50;
- LinkedList<Long> versions = new LinkedList<Long>();
+ LinkedList<Long> versions = new LinkedList<>();
addDocs(10, start, versions); start+=10;
assertJQ(req("qt","/get", "getVersions",""+maxReq), "/versions==" + versions.subList(0,Math.min(maxReq,start)));
assertU(commit());
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java Wed Mar 12 14:39:17 2014
@@ -154,7 +154,7 @@ public class TestRecoveryHdfs extends So
clearIndex();
assertU(commit());
- Deque<Long> versions = new ArrayDeque<Long>();
+ Deque<Long> versions = new ArrayDeque<>();
versions.addFirst(addAndGetVersion(sdoc("id", "A1"), null));
versions.addFirst(addAndGetVersion(sdoc("id", "A11"), null));
versions.addFirst(addAndGetVersion(sdoc("id", "A12"), null));
@@ -768,7 +768,7 @@ public class TestRecoveryHdfs extends So
int start = 0;
int maxReq = 50;
- LinkedList<Long> versions = new LinkedList<Long>();
+ LinkedList<Long> versions = new LinkedList<>();
addDocs(10, start, versions); start+=10;
assertJQ(req("qt","/get", "getVersions",""+maxReq), "/versions==" + versions.subList(0,Math.min(maxReq,start)));
assertU(commit());