You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/03/16 20:39:37 UTC
svn commit: r1578144 [33/37] - in /lucene/dev/branches/lucene5376_2: ./
dev-tools/ dev-tools/idea/.idea/libraries/
dev-tools/idea/solr/contrib/dataimporthandler/
dev-tools/idea/solr/contrib/map-reduce/ dev-tools/idea/solr/core/src/test/
dev-tools/scrip...
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java Sun Mar 16 19:39:10 2014
@@ -90,7 +90,7 @@ public class TriLevelCompositeIdRoutingT
commit();
- HashMap<String, Integer> idMap = new HashMap<String, Integer>();
+ HashMap<String, Integer> idMap = new HashMap<>();
for (int i = 1; i <= sliceCount; i++) {
@@ -122,7 +122,7 @@ public class TriLevelCompositeIdRoutingT
commit();
- HashMap<String, Integer> idMap = new HashMap<String, Integer>();
+ HashMap<String, Integer> idMap = new HashMap<>();
for (int i = 1; i <= sliceCount; i++) {
@@ -142,7 +142,7 @@ public class TriLevelCompositeIdRoutingT
Set<String> doQueryGetUniqueIdKeys(String... queryParams) throws Exception {
QueryResponse rsp = cloudClient.query(params(queryParams));
- Set<String> obtainedIdKeys = new HashSet<String>();
+ Set<String> obtainedIdKeys = new HashSet<>();
for (SolrDocument doc : rsp.getResults()) {
obtainedIdKeys.add(getKey((String) doc.get("id")));
}
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java Sun Mar 16 19:39:10 2014
@@ -175,7 +175,7 @@ public class ZkControllerTest extends So
zkClient.makePath(ZkController.CONFIGS_ZKNODE + "/" + actualConfigName, true);
- Map<String,Object> props = new HashMap<String,Object>();
+ Map<String,Object> props = new HashMap<>();
props.put("configName", actualConfigName);
ZkNodeProps zkProps = new ZkNodeProps(props);
zkClient.makePath(ZkStateReader.COLLECTIONS_ZKNODE + "/"
@@ -190,7 +190,7 @@ public class ZkControllerTest extends So
cc = getCoreContainer();
ZkController zkController = new ZkController(cc, server.getZkAddress(), TIMEOUT, 10000,
- "127.0.0.1", "8983", "solr", 0, true, new CurrentCoreDescriptorProvider() {
+ "127.0.0.1", "8983", "solr", 0, 60000, true, new CurrentCoreDescriptorProvider() {
@Override
public List<CoreDescriptor> getCurrentDescriptors() {
@@ -230,7 +230,7 @@ public class ZkControllerTest extends So
cc = getCoreContainer();
zkController = new ZkController(cc, server.getZkAddress(),
- TIMEOUT, 10000, "127.0.0.1", "8983", "solr", 0, true, new CurrentCoreDescriptorProvider() {
+ TIMEOUT, 10000, "127.0.0.1", "8983", "solr", 0, 60000, true, new CurrentCoreDescriptorProvider() {
@Override
public List<CoreDescriptor> getCurrentDescriptors() {
@@ -284,7 +284,7 @@ public class ZkControllerTest extends So
try {
zkController = new ZkController(cc, server.getZkAddress(), TIMEOUT, 10000,
- "http://127.0.0.1", "8983", "solr", 0, true, new CurrentCoreDescriptorProvider() {
+ "http://127.0.0.1", "8983", "solr", 0, 60000, true, new CurrentCoreDescriptorProvider() {
@Override
public List<CoreDescriptor> getCurrentDescriptors() {
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/ZkNodePropsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/ZkNodePropsTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/ZkNodePropsTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/ZkNodePropsTest.java Sun Mar 16 19:39:10 2014
@@ -30,7 +30,7 @@ public class ZkNodePropsTest extends Sol
@Test
public void testBasic() throws IOException {
- Map<String,Object> props = new HashMap<String,Object>();
+ Map<String,Object> props = new HashMap<>();
props.put("prop1", "value1");
props.put("prop2", "value2");
props.put("prop3", "value3");
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java Sun Mar 16 19:39:10 2014
@@ -36,7 +36,7 @@ public class HdfsTestUtil {
private static Locale savedLocale;
- private static Map<MiniDFSCluster,Timer> timers = new ConcurrentHashMap<MiniDFSCluster,Timer>();
+ private static Map<MiniDFSCluster,Timer> timers = new ConcurrentHashMap<>();
public static MiniDFSCluster setupClass(String dataDir) throws Exception {
LuceneTestCase.assumeFalse("HDFS tests were disabled by -Dtests.disableHdfs",
@@ -64,6 +64,8 @@ public class HdfsTestUtil {
System.setProperty("solr.hdfs.home", "/solr_hdfs_home");
+ System.setProperty("solr.hdfs.blockcache.global", Boolean.toString(LuceneTestCase.random().nextBoolean()));
+
final MiniDFSCluster dfsCluster = new MiniDFSCluster(conf, dataNodes, true, null);
dfsCluster.waitActive();
@@ -92,6 +94,7 @@ public class HdfsTestUtil {
System.clearProperty("test.build.data");
System.clearProperty("test.cache.data");
System.clearProperty("solr.hdfs.home");
+ System.clearProperty("solr.hdfs.blockcache.global");
if (dfsCluster != null) {
timers.remove(dfsCluster);
dfsCluster.shutdown();
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java Sun Mar 16 19:39:10 2014
@@ -155,7 +155,7 @@ public class StressHdfsTest extends Basi
}
// collect the data dirs
- List<String> dataDirs = new ArrayList<String>();
+ List<String> dataDirs = new ArrayList<>();
int i = 0;
for (SolrServer client : clients) {
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java Sun Mar 16 19:39:10 2014
@@ -33,7 +33,7 @@ import org.junit.Test;
*/
public class CachingDirectoryFactoryTest extends SolrTestCaseJ4 {
- private Map<String,Tracker> dirs = new HashMap<String,Tracker>();
+ private Map<String,Tracker> dirs = new HashMap<>();
private volatile boolean stop = false;
private class Tracker {
@@ -46,7 +46,7 @@ public class CachingDirectoryFactoryTest
public void stressTest() throws Exception {
final CachingDirectoryFactory df = new RAMDirectoryFactory();
- List<Thread> threads = new ArrayList<Thread>();
+ List<Thread> threads = new ArrayList<>();
int threadCount = 11;
for (int i = 0; i < threadCount; i++) {
Thread getDirThread = new GetDirThread(df);
@@ -126,7 +126,7 @@ public class CachingDirectoryFactoryTest
synchronized (dirs) {
int sz = dirs.size();
- List<Tracker> dirsList = new ArrayList<Tracker>();
+ List<Tracker> dirsList = new ArrayList<>();
dirsList.addAll(dirs.values());
if (sz > 0) {
Tracker tracker = dirsList.get(Math.min(dirsList.size() - 1,
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java Sun Mar 16 19:39:10 2014
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.Atomi
public class CountUsageValueSourceParser extends ValueSourceParser {
private static final ConcurrentMap<String,AtomicInteger> counters
- = new ConcurrentHashMap<String,AtomicInteger>();
+ = new ConcurrentHashMap<>();
public static void clearCounters() {
counters.clear();
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java Sun Mar 16 19:39:10 2014
@@ -69,8 +69,8 @@ public class OpenCloseCoreStressTest ext
File solrHomeDirectory;
- List<HttpSolrServer> indexingServers = new ArrayList<HttpSolrServer>(indexingThreads);
- List<HttpSolrServer> queryServers = new ArrayList<HttpSolrServer>(queryThreads);
+ List<HttpSolrServer> indexingServers = new ArrayList<>(indexingThreads);
+ List<HttpSolrServer> queryServers = new ArrayList<>(queryThreads);
static String savedFactory;
@@ -81,8 +81,8 @@ public class OpenCloseCoreStressTest ext
@Before
public void setupServer() throws Exception {
- coreCounts = new TreeMap<String, Long>();
- coreNames = new ArrayList<String>();
+ coreCounts = new TreeMap<>();
+ coreNames = new ArrayList<>();
cumulativeDocs = 0;
solrHomeDirectory = new File(TEMP_DIR, "OpenCloseCoreStressTest_");
@@ -328,7 +328,7 @@ class Indexer {
static volatile int lastCount;
static volatile long nextTime;
- ArrayList<OneIndexer> _threads = new ArrayList<OneIndexer>();
+ ArrayList<OneIndexer> _threads = new ArrayList<>();
public Indexer(OpenCloseCoreStressTest OCCST, String url, List<HttpSolrServer> servers, int numThreads, int secondsToRun, Random random) {
stopTime = System.currentTimeMillis() + (secondsToRun * 1000);
@@ -436,7 +436,7 @@ class OneIndexer extends Thread {
class Queries {
static AtomicBoolean _keepon = new AtomicBoolean(true);
- List<Thread> _threads = new ArrayList<Thread>();
+ List<Thread> _threads = new ArrayList<>();
static AtomicInteger _errors = new AtomicInteger(0);
String baseUrl;
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java Sun Mar 16 19:39:10 2014
@@ -178,7 +178,7 @@ public class QueryResultKeyTest extends
* specified ints
*/
private List<Query> buildFiltersFromNumbers(int[] values) {
- ArrayList<Query> filters = new ArrayList<Query>(values.length);
+ ArrayList<Query> filters = new ArrayList<>(values.length);
for (int val : values) {
filters.add(new FlatHashTermQuery(String.valueOf(val)));
}
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java Sun Mar 16 19:39:10 2014
@@ -172,7 +172,7 @@ public class SolrCoreTest extends SolrTe
final int LOOP = 100;
final int MT = 16;
ExecutorService service = Executors.newFixedThreadPool(MT, new DefaultSolrThreadFactory("refCountMT"));
- List<Callable<Integer>> callees = new ArrayList<Callable<Integer>>(MT);
+ List<Callable<Integer>> callees = new ArrayList<>(MT);
final CoreContainer cores = h.getCoreContainer();
for (int i = 0; i < MT; ++i) {
Callable<Integer> call = new Callable<Integer>() {
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java Sun Mar 16 19:39:10 2014
@@ -130,7 +130,7 @@ public class TestCoreContainer extends S
}
}
- List<Thread> threads = new ArrayList<Thread>();
+ List<Thread> threads = new ArrayList<>();
int numThreads = 4;
for (int i = 0; i < numThreads; i++) {
threads.add(new TestThread());
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java Sun Mar 16 19:39:10 2014
@@ -178,7 +178,7 @@ public class TestJmxIntegration extends
private ObjectName getObjectName(String key, SolrInfoMBean infoBean)
throws MalformedObjectNameException {
- Hashtable<String, String> map = new Hashtable<String, String>();
+ Hashtable<String, String> map = new Hashtable<>();
map.put("type", key);
map.put("id", infoBean.getName());
String coreName = h.getCore().getName();
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestLazyCores.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestLazyCores.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestLazyCores.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestNonNRTOpen.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestNonNRTOpen.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestNonNRTOpen.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestNonNRTOpen.java Sun Mar 16 19:39:10 2014
@@ -30,8 +30,12 @@ import org.apache.solr.util.RefCounted;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class TestNonNRTOpen extends SolrTestCaseJ4 {
-
+ private static final Logger log = LoggerFactory.getLogger(TestNonNRTOpen.class);
+
@BeforeClass
public static void beforeClass() throws Exception {
// use a filesystem, because we need to create an index, then "start up solr"
@@ -80,6 +84,7 @@ public class TestNonNRTOpen extends Solr
// core reload
String core = h.getCore().getName();
+ log.info("Reloading core: " + h.getCore().toString());
h.getCoreContainer().reload(core);
assertNotNRT(1);
@@ -90,6 +95,7 @@ public class TestNonNRTOpen extends Solr
// add a doc and core reload
assertU(adoc("bazz", "doc2"));
+ log.info("Reloading core: " + h.getCore().toString());
h.getCoreContainer().reload(core);
assertNotNRT(3);
}
@@ -127,11 +133,15 @@ public class TestNonNRTOpen extends Solr
}
static void assertNotNRT(int maxDoc) {
- RefCounted<SolrIndexSearcher> searcher = h.getCore().getSearcher();
+ SolrCore core = h.getCore();
+ log.info("Checking notNRT & maxDoc=" + maxDoc + " of core=" + core.toString());
+ RefCounted<SolrIndexSearcher> searcher = core.getSearcher();
try {
- DirectoryReader ir = searcher.get().getIndexReader();
- assertEquals(maxDoc, ir.maxDoc());
- assertFalse("expected non-NRT reader, got: " + ir, ir.toString().contains(":nrt"));
+ SolrIndexSearcher s = searcher.get();
+ DirectoryReader ir = s.getIndexReader();
+ assertEquals("SOLR-5815? : wrong maxDoc: core=" + core.toString() +" searcher=" + s.toString(),
+ maxDoc, ir.maxDoc());
+ assertFalse("SOLR-5815? : expected non-NRT reader, got: " + ir, ir.toString().contains(":nrt"));
} finally {
searcher.decref();
}
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXml.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXml.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXml.java Sun Mar 16 19:39:10 2014
@@ -46,29 +46,29 @@ public class TestSolrXml extends SolrTes
loader = new SolrResourceLoader(solrHome.getAbsolutePath());
ConfigSolr cfg = ConfigSolr.fromSolrHome(loader, solrHome.getAbsolutePath());
- assertEquals("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_ADMINHANDLER, null), "testAdminHandler");
- assertEquals("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_COLLECTIONSHANDLER, null), "testCollectionsHandler");
- assertEquals("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_INFOHANDLER, null), "testInfoHandler");
- assertEquals("Did not find expected value", cfg.getInt(ConfigSolr.CfgProp.SOLR_CORELOADTHREADS, 0), 11);
- assertEquals("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_COREROOTDIRECTORY, null), "testCoreRootDirectory");
- assertEquals("Did not find expected value", cfg.getInt(ConfigSolr.CfgProp.SOLR_DISTRIBUPDATECONNTIMEOUT, 0), 22);
- assertEquals("Did not find expected value", cfg.getInt(ConfigSolr.CfgProp.SOLR_DISTRIBUPDATESOTIMEOUT, 0), 33);
- assertEquals("Did not find expected value", cfg.getInt(ConfigSolr.CfgProp.SOLR_MAXUPDATECONNECTIONS, 0), 3);
- assertEquals("Did not find expected value", cfg.getInt(ConfigSolr.CfgProp.SOLR_MAXUPDATECONNECTIONSPERHOST, 0), 37);
- assertEquals("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_HOST, null), "testHost");
- assertEquals("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_HOSTCONTEXT, null), "testHostContext");
- assertEquals("Did not find expected value", cfg.getInt(ConfigSolr.CfgProp.SOLR_HOSTPORT, 0), 44);
- assertEquals("Did not find expected value", cfg.getInt(ConfigSolr.CfgProp.SOLR_LEADERVOTEWAIT, 0), 55);
- assertEquals("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_LOGGING_CLASS, null), "testLoggingClass");
- assertEquals("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_LOGGING_ENABLED, null), "testLoggingEnabled");
- assertEquals("Did not find expected value", cfg.getInt(ConfigSolr.CfgProp.SOLR_LOGGING_WATCHER_SIZE, 0), 88);
- assertEquals("Did not find expected value", cfg.getInt(ConfigSolr.CfgProp.SOLR_LOGGING_WATCHER_THRESHOLD, 0), 99);
- assertEquals("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_MANAGEMENTPATH, null), "testManagementPath");
- assertEquals("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_SHAREDLIB, null), "testSharedLib");
- assertEquals("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_SHARESCHEMA, null), "testShareSchema");
- assertEquals("Did not find expected value", cfg.getInt(ConfigSolr.CfgProp.SOLR_TRANSIENTCACHESIZE, 0), 66);
- assertEquals("Did not find expected value", cfg.getInt(ConfigSolr.CfgProp.SOLR_ZKCLIENTTIMEOUT, 0), 77);
- assertEquals("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_ZKHOST, null), "testZkHost");
+ assertEquals("Did not find expected value", "testAdminHandler", cfg.get(ConfigSolr.CfgProp.SOLR_ADMINHANDLER, null));
+ assertEquals("Did not find expected value", "testCollectionsHandler", cfg.get(ConfigSolr.CfgProp.SOLR_COLLECTIONSHANDLER, null));
+ assertEquals("Did not find expected value", "testInfoHandler", cfg.get(ConfigSolr.CfgProp.SOLR_INFOHANDLER, null));
+ assertEquals("Did not find expected value", 11, cfg.getInt(ConfigSolr.CfgProp.SOLR_CORELOADTHREADS, 0));
+ assertEquals("Did not find expected value", "testCoreRootDirectory", cfg.get(ConfigSolr.CfgProp.SOLR_COREROOTDIRECTORY, null));
+ assertEquals("Did not find expected value", 22, cfg.getInt(ConfigSolr.CfgProp.SOLR_DISTRIBUPDATECONNTIMEOUT, 0));
+ assertEquals("Did not find expected value", 33, cfg.getInt(ConfigSolr.CfgProp.SOLR_DISTRIBUPDATESOTIMEOUT, 0));
+ assertEquals("Did not find expected value", 3, cfg.getInt(ConfigSolr.CfgProp.SOLR_MAXUPDATECONNECTIONS, 0));
+ assertEquals("Did not find expected value", 37, cfg.getInt(ConfigSolr.CfgProp.SOLR_MAXUPDATECONNECTIONSPERHOST, 0));
+ assertEquals("Did not find expected value", "testHost", cfg.get(ConfigSolr.CfgProp.SOLR_HOST, null));
+ assertEquals("Did not find expected value", "testHostContext", cfg.get(ConfigSolr.CfgProp.SOLR_HOSTCONTEXT, null));
+ assertEquals("Did not find expected value", 44, cfg.getInt(ConfigSolr.CfgProp.SOLR_HOSTPORT, 0));
+ assertEquals("Did not find expected value", 55, cfg.getInt(ConfigSolr.CfgProp.SOLR_LEADERVOTEWAIT, 0));
+ assertEquals("Did not find expected value", "testLoggingClass", cfg.get(ConfigSolr.CfgProp.SOLR_LOGGING_CLASS, null));
+ assertEquals("Did not find expected value", "testLoggingEnabled", cfg.get(ConfigSolr.CfgProp.SOLR_LOGGING_ENABLED, null));
+ assertEquals("Did not find expected value", 88, cfg.getInt(ConfigSolr.CfgProp.SOLR_LOGGING_WATCHER_SIZE, 0));
+ assertEquals("Did not find expected value", 99, cfg.getInt(ConfigSolr.CfgProp.SOLR_LOGGING_WATCHER_THRESHOLD, 0));
+ assertEquals("Did not find expected value", "testManagementPath", cfg.get(ConfigSolr.CfgProp.SOLR_MANAGEMENTPATH, null));
+ assertEquals("Did not find expected value", "testSharedLib", cfg.get(ConfigSolr.CfgProp.SOLR_SHAREDLIB, null));
+ assertEquals("Did not find expected value", "testShareSchema", cfg.get(ConfigSolr.CfgProp.SOLR_SHARESCHEMA, null));
+ assertEquals("Did not find expected value", 66, cfg.getInt(ConfigSolr.CfgProp.SOLR_TRANSIENTCACHESIZE, 0));
+ assertEquals("Did not find expected value", 77, cfg.getInt(ConfigSolr.CfgProp.SOLR_ZKCLIENTTIMEOUT, 0));
+ assertEquals("Did not find expected value", "testZkHost", cfg.get(ConfigSolr.CfgProp.SOLR_ZKHOST, null));
assertNull("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_PERSISTENT, null));
assertNull("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_CORES_DEFAULT_CORE_NAME, null));
assertNull("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_ADMINPATH, null));
@@ -95,9 +95,9 @@ public class TestSolrXml extends SolrTes
try {
loader = new SolrResourceLoader(solrHome.getAbsolutePath());
ConfigSolr cfg = ConfigSolr.fromSolrHome(loader, solrHome.getAbsolutePath());
- assertEquals("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_COREROOTDIRECTORY, null), "myCoreRoot");
- assertEquals("Did not find expected value", cfg.getInt(ConfigSolr.CfgProp.SOLR_HOSTPORT, 0), 8888);
- assertEquals("Did not find expected value", cfg.get(ConfigSolr.CfgProp.SOLR_SHARESCHEMA, null), "newShareSchema");
+ assertEquals("Did not find expected value", "myCoreRoot", cfg.get(ConfigSolr.CfgProp.SOLR_COREROOTDIRECTORY, null));
+ assertEquals("Did not find expected value", 8888, cfg.getInt(ConfigSolr.CfgProp.SOLR_HOSTPORT, 0));
+ assertEquals("Did not find expected value", "newShareSchema", cfg.get(ConfigSolr.CfgProp.SOLR_SHARESCHEMA, null));
}
finally {
loader.close();
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java Sun Mar 16 19:39:10 2014
@@ -37,8 +37,7 @@ public class TestSolrXmlPersistor exten
final String solrxml = "<solr><cores adminHandler=\"/admin\"/></solr>";
SolrXMLCoresLocator persistor = new SolrXMLCoresLocator(solrxml, null);
- assertEquals(persistor.buildSolrXML(EMPTY_CD_LIST),
- "<solr><cores adminHandler=\"/admin\"></cores></solr>");
+ assertEquals("<solr><cores adminHandler=\"/admin\"></cores></solr>", persistor.buildSolrXML(EMPTY_CD_LIST));
}
@@ -47,7 +46,7 @@ public class TestSolrXmlPersistor exten
final String solrxml = "<solr><cores adminHandler=\"/admin\"></cores></solr>";
SolrXMLCoresLocator persistor = new SolrXMLCoresLocator(solrxml, null);
- assertEquals(persistor.buildSolrXML(EMPTY_CD_LIST), "<solr><cores adminHandler=\"/admin\"></cores></solr>");
+ assertEquals("<solr><cores adminHandler=\"/admin\"></cores></solr>", persistor.buildSolrXML(EMPTY_CD_LIST));
}
@Test
@@ -55,7 +54,7 @@ public class TestSolrXmlPersistor exten
final String solrxml = "<solr></solr>";
SolrXMLCoresLocator persistor = new SolrXMLCoresLocator(solrxml, null);
- assertEquals(persistor.buildSolrXML(EMPTY_CD_LIST), "<solr><cores></cores></solr>");
+ assertEquals("<solr><cores></cores></solr>", persistor.buildSolrXML(EMPTY_CD_LIST));
}
@Test
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java Sun Mar 16 19:39:10 2014
@@ -19,6 +19,8 @@ package org.apache.solr.handler.componen
import java.io.File;
+import org.apache.lucene.util.Constants;
+
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams;
@@ -32,8 +34,8 @@ public class DistributedQueryElevationCo
@BeforeClass
public static void betterNotBeJ9() {
- assumeFalse("FIXME: SOLR-5791: This test fails under J9",
- System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+ assumeFalse("FIXME: SOLR-5791: This test fails under IBM J9",
+ Constants.JAVA_VENDOR.startsWith("IBM"));
}
public DistributedQueryElevationComponentTest() {
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java Sun Mar 16 19:39:10 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");
@@ -395,4 +395,36 @@ public class StatsComponentTest extends
400);
}
+
+ //SOLR-3177
+ public void testStatsExcludeFilterQuery() throws Exception {
+ SolrCore core = h.getCore();
+ assertU(adoc("id", "1"));
+ assertU(adoc("id", "2"));
+ assertU(adoc("id", "3"));
+ assertU(adoc("id", "4"));
+ assertU(commit());
+
+ Map<String, String> args = new HashMap<String, String>();
+ args.put(CommonParams.Q, "*:*");
+ args.put(StatsParams.STATS, "true");
+ args.put(StatsParams.STATS_FIELD, "{!ex=id}id");
+ args.put("fq", "{!tag=id}id:[2 TO 3]");
+ SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args));
+
+ assertQ("test exluding filter query", req
+ , "//lst[@name='id']/double[@name='min'][.='1.0']"
+ , "//lst[@name='id']/double[@name='max'][.='4.0']");
+
+ args = new HashMap<String, String>();
+ args.put(CommonParams.Q, "*:*");
+ args.put(StatsParams.STATS, "true");
+ args.put(StatsParams.STATS_FIELD, "{!key=id2}id");
+ args.put("fq", "{!tag=id}id:[2 TO 3]");
+ req = new LocalSolrQueryRequest(core, new MapSolrParams(args));
+
+ assertQ("test rename field", req
+ , "//lst[@name='id2']/double[@name='min'][.='2.0']"
+ , "//lst[@name='id2']/double[@name='max'][.='3.0']");
+ }
}
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java Sun Mar 16 19:39:10 2014
@@ -17,6 +17,8 @@
package org.apache.solr.handler.component;
+import org.apache.lucene.util.Constants;
+
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.common.params.TermVectorParams;
import org.junit.BeforeClass;
@@ -24,8 +26,8 @@ import org.junit.BeforeClass;
public class TermVectorComponentDistributedTest extends BaseDistributedSearchTestCase {
@BeforeClass
public static void betterNotBeJ9() {
- assumeFalse("FIXME: SOLR-5792: This test fails under J9",
- System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+ assumeFalse("FIXME: SOLR-5792: This test fails under IBM J9",
+ Constants.JAVA_VENDOR.startsWith("IBM"));
}
@Override
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/request/TestFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/request/TestFaceting.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/request/TestFaceting.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/request/TestFaceting.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java Sun Mar 16 19:39:10 2014
@@ -24,13 +24,32 @@ import org.restlet.ext.servlet.ServerSer
import java.util.SortedMap;
import java.util.TreeMap;
+/**
+ * Base class for Solr Restlet-based tests. Creates jetty and test harness
+ * with solrconfig.xml and schema-rest.xml, including "extra" servlets for
+ * all Solr Restlet Application subclasses.
+ *
+ * Use RestTestBase instead if you need to specialize the solrconfig,
+ * the schema, or jetty/test harness creation; otherwise you'll get
+ * imbalanced SolrIndexSearcher closes/opens and a suite-level failure
+ * for a zombie thread.
+ */
abstract public class SolrRestletTestBase extends RestTestBase {
+
+ /**
+ * Creates test harness, including "extra" servlets for all
+ * Solr Restlet Application subclasses.
+ */
@BeforeClass
public static void init() throws Exception {
- final SortedMap<ServletHolder,String> extraServlets = new TreeMap<ServletHolder,String>();
- 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...'
+ final SortedMap<ServletHolder,String> extraServlets = new TreeMap<>();
+ final ServletHolder solrSchemaRestApi = new ServletHolder("SolrSchemaRestApi", ServerServlet.class);
+ solrSchemaRestApi.setInitParameter("org.restlet.application", "org.apache.solr.rest.SolrSchemaRestApi");
+ extraServlets.put(solrSchemaRestApi, "/schema/*"); // '/schema/*' matches '/schema', '/schema/', and '/schema/whatever...'
+
+ final ServletHolder solrConfigRestApi = new ServletHolder("SolrConfigRestApi", ServerServlet.class);
+ solrConfigRestApi.setInitParameter("org.restlet.application", "org.apache.solr.rest.SolrConfigRestApi");
+ extraServlets.put(solrConfigRestApi, "/config/*");
createJettyAndHarness(TEST_HOME(), "solrconfig.xml", "schema-rest.xml", "/solr", true, extraServlets);
}
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/schema/TestClassNameShortening.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/schema/TestClassNameShortening.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/schema/TestClassNameShortening.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/schema/TestClassNameShortening.java Sun Mar 16 19:39:10 2014
@@ -30,9 +30,9 @@ public class TestClassNameShortening ext
@BeforeClass
public static void init() throws Exception {
- final SortedMap<ServletHolder,String> extraServlets = new TreeMap<ServletHolder,String>();
- final ServletHolder solrRestApi = new ServletHolder("SolrRestApi", ServerServlet.class);
- solrRestApi.setInitParameter("org.restlet.application", "org.apache.solr.rest.SolrRestApi");
+ final SortedMap<ServletHolder,String> extraServlets = new TreeMap<>();
+ final ServletHolder solrRestApi = new ServletHolder("SolrSchemaRestApi", ServerServlet.class);
+ solrRestApi.setInitParameter("org.restlet.application", "org.apache.solr.rest.SolrSchemaRestApi");
extraServlets.put(solrRestApi, "/schema/*"); // '/schema/*' matches '/schema', '/schema/', and '/schema/whatever...'
createJettyAndHarness(TEST_HOME(), "solrconfig-minimal.xml", "schema-class-name-shortening-on-serialization.xml",
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java Sun Mar 16 19:39:10 2014
@@ -46,9 +46,9 @@ 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 ServletHolder solrRestApi = new ServletHolder("SolrRestApi", ServerServlet.class);
- solrRestApi.setInitParameter("org.restlet.application", "org.apache.solr.rest.SolrRestApi");
+ final SortedMap<ServletHolder,String> extraServlets = new TreeMap<>();
+ final ServletHolder solrRestApi = new ServletHolder("SolrSchemaRestApi", ServerServlet.class);
+ solrRestApi.setInitParameter("org.restlet.application", "org.apache.solr.rest.SolrSchemaRestApi");
extraServlets.put(solrRestApi, "/schema/*"); // '/schema/*' matches '/schema', '/schema/', and '/schema/whatever...'
System.setProperty("managed.schema.mutable", "true");
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java Sun Mar 16 19:39:10 2014
@@ -30,9 +30,9 @@ public class TestSerializedLuceneMatchVe
@BeforeClass
public static void init() throws Exception {
- final SortedMap<ServletHolder,String> extraServlets = new TreeMap<ServletHolder,String>();
- final ServletHolder solrRestApi = new ServletHolder("SolrRestApi", ServerServlet.class);
- solrRestApi.setInitParameter("org.restlet.application", "org.apache.solr.rest.SolrRestApi");
+ final SortedMap<ServletHolder,String> extraServlets = new TreeMap<>();
+ final ServletHolder solrRestApi = new ServletHolder("SolrSchemaRestApi", ServerServlet.class);
+ solrRestApi.setInitParameter("org.restlet.application", "org.apache.solr.rest.SolrSchemaRestApi");
extraServlets.put(solrRestApi, "/schema/*"); // '/schema/*' matches '/schema', '/schema/', and '/schema/whatever...'
createJettyAndHarness(TEST_HOME(), "solrconfig-minimal.xml", "schema-rest-lucene-match-version.xml",
Modified: lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java (original)
+++ lucene/dev/branches/lucene5376_2/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java Sun Mar 16 19:39:10 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) );