You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/03/12 19:14:27 UTC
svn commit: r1576837 [20/29] - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/
lucene/analysis/co...
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java Wed Mar 12 18:14:05 2014
@@ -118,7 +118,7 @@ public class LoggingHandler extends Requ
return;
}
else {
- SimpleOrderedMap<Object> info = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> info = new SimpleOrderedMap<>();
if(time>0) {
info.add("since", time);
info.add("found", found);
@@ -137,10 +137,10 @@ public class LoggingHandler extends Requ
else {
rsp.add("levels", watcher.getAllLevels());
- List<LoggerInfo> loggers = new ArrayList<LoggerInfo>(watcher.getAllLoggers());
+ List<LoggerInfo> loggers = new ArrayList<>(watcher.getAllLoggers());
Collections.sort(loggers);
- List<SimpleOrderedMap<?>> info = new ArrayList<SimpleOrderedMap<?>>();
+ List<SimpleOrderedMap<?>> info = new ArrayList<>();
for(LoggerInfo wrap:loggers) {
info.add(wrap.getInfo());
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java Wed Mar 12 18:14:05 2014
@@ -147,7 +147,7 @@ public class LukeRequestHandler extends
SimpleOrderedMap<Object> info = getDocumentFieldsInfo( doc, docId, reader, schema );
- SimpleOrderedMap<Object> docinfo = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> docinfo = new SimpleOrderedMap<>();
docinfo.add( "docId", docId );
docinfo.add( "lucene", info );
docinfo.add( "solr", doc );
@@ -161,7 +161,7 @@ public class LukeRequestHandler extends
}
// Add some generally helpful information
- NamedList<Object> info = new SimpleOrderedMap<Object>();
+ NamedList<Object> info = new SimpleOrderedMap<>();
info.add( "key", getFieldFlagsKey() );
info.add( "NOTE", "Document Frequency (df) is not updated when a document is marked for deletion. df values include deleted documents." );
rsp.add( "info", info );
@@ -241,7 +241,7 @@ public class LukeRequestHandler extends
* @return a key to what each character means
*/
public static SimpleOrderedMap<String> getFieldFlagsKey() {
- SimpleOrderedMap<String> key = new SimpleOrderedMap<String>();
+ SimpleOrderedMap<String> key = new SimpleOrderedMap<>();
for (FieldFlag f : FieldFlag.values()) {
key.add(String.valueOf(f.getAbbreviation()), f.getDisplay() );
}
@@ -252,10 +252,10 @@ public class LukeRequestHandler extends
IndexSchema schema ) throws IOException
{
final CharsRef spare = new CharsRef();
- SimpleOrderedMap<Object> finfo = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> finfo = new SimpleOrderedMap<>();
for( Object o : doc.getFields() ) {
Field field = (Field)o;
- SimpleOrderedMap<Object> f = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> f = new SimpleOrderedMap<>();
SchemaField sfield = schema.getFieldOrNull( field.name() );
FieldType ftype = (sfield==null)?null:sfield.getType();
@@ -283,7 +283,7 @@ public class LukeRequestHandler extends
try {
Terms v = reader.getTermVector( docId, field.name() );
if( v != null ) {
- SimpleOrderedMap<Integer> tfv = new SimpleOrderedMap<Integer>();
+ SimpleOrderedMap<Integer> tfv = new SimpleOrderedMap<>();
final TermsEnum termsEnum = v.iterator(null);
BytesRef text;
while((text = termsEnum.next()) != null) {
@@ -313,27 +313,27 @@ public class LukeRequestHandler extends
Set<String> fields = null;
String fl = params.get(CommonParams.FL);
if (fl != null) {
- fields = new TreeSet<String>(Arrays.asList(fl.split( "[,\\s]+" )));
+ fields = new TreeSet<>(Arrays.asList(fl.split( "[,\\s]+" )));
}
AtomicReader reader = searcher.getAtomicReader();
IndexSchema schema = searcher.getSchema();
// Don't be tempted to put this in the loop below, the whole point here is to alphabetize the fields!
- Set<String> fieldNames = new TreeSet<String>();
+ Set<String> fieldNames = new TreeSet<>();
for(FieldInfo fieldInfo : reader.getFieldInfos()) {
fieldNames.add(fieldInfo.name);
}
// Walk the term enum and keep a priority queue for each map in our set
- SimpleOrderedMap<Object> finfo = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> finfo = new SimpleOrderedMap<>();
for (String fieldName : fieldNames) {
if (fields != null && ! fields.contains(fieldName) && ! fields.contains("*")) {
continue; //we're not interested in this field Still an issue here
}
- SimpleOrderedMap<Object> fieldMap = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> fieldMap = new SimpleOrderedMap<>();
SchemaField sfield = schema.getFieldOrNull( fieldName );
FieldType ftype = (sfield==null)?null:sfield.getType();
@@ -408,21 +408,21 @@ public class LukeRequestHandler extends
* Return info from the index
*/
private static SimpleOrderedMap<Object> getSchemaInfo( IndexSchema schema ) {
- Map<String, List<String>> typeusemap = new TreeMap<String, List<String>>();
- Map<String, Object> fields = new TreeMap<String, Object>();
+ Map<String, List<String>> typeusemap = new TreeMap<>();
+ Map<String, Object> fields = new TreeMap<>();
SchemaField uniqueField = schema.getUniqueKeyField();
for( SchemaField f : schema.getFields().values() ) {
populateFieldInfo(schema, typeusemap, fields, uniqueField, f);
}
- Map<String, Object> dynamicFields = new TreeMap<String, Object>();
+ Map<String, Object> dynamicFields = new TreeMap<>();
for (SchemaField f : schema.getDynamicFieldPrototypes()) {
populateFieldInfo(schema, typeusemap, dynamicFields, uniqueField, f);
}
- SimpleOrderedMap<Object> types = new SimpleOrderedMap<Object>();
- Map<String, FieldType> sortedTypes = new TreeMap<String, FieldType>(schema.getFieldTypes());
+ SimpleOrderedMap<Object> types = new SimpleOrderedMap<>();
+ Map<String, FieldType> sortedTypes = new TreeMap<>(schema.getFieldTypes());
for( FieldType ft : sortedTypes.values() ) {
- SimpleOrderedMap<Object> field = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> field = new SimpleOrderedMap<>();
field.add("fields", typeusemap.get( ft.getTypeName() ) );
field.add("tokenized", ft.isTokenized() );
field.add("className", ft.getClass().getName());
@@ -433,15 +433,15 @@ public class LukeRequestHandler extends
}
// Must go through this to maintain binary compatbility. Putting a TreeMap into a resp leads to casting errors
- SimpleOrderedMap<Object> finfo = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> finfo = new SimpleOrderedMap<>();
- SimpleOrderedMap<Object> fieldsSimple = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> fieldsSimple = new SimpleOrderedMap<>();
for (Map.Entry<String, Object> ent : fields.entrySet()) {
fieldsSimple.add(ent.getKey(), ent.getValue());
}
finfo.add("fields", fieldsSimple);
- SimpleOrderedMap<Object> dynamicSimple = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> dynamicSimple = new SimpleOrderedMap<>();
for (Map.Entry<String, Object> ent : dynamicFields.entrySet()) {
dynamicSimple.add(ent.getKey(), ent.getValue());
}
@@ -455,7 +455,7 @@ public class LukeRequestHandler extends
}
private static SimpleOrderedMap<Object> getSimilarityInfo(Similarity similarity) {
- SimpleOrderedMap<Object> toReturn = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> toReturn = new SimpleOrderedMap<>();
if (similarity != null) {
toReturn.add("className", similarity.getClass().getName());
toReturn.add("details", similarity.toString());
@@ -464,16 +464,16 @@ public class LukeRequestHandler extends
}
private static SimpleOrderedMap<Object> getAnalyzerInfo(Analyzer analyzer) {
- SimpleOrderedMap<Object> aninfo = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> aninfo = new SimpleOrderedMap<>();
aninfo.add("className", analyzer.getClass().getName());
if (analyzer instanceof TokenizerChain) {
TokenizerChain tchain = (TokenizerChain)analyzer;
CharFilterFactory[] cfiltfacs = tchain.getCharFilterFactories();
- SimpleOrderedMap<Map<String, Object>> cfilters = new SimpleOrderedMap<Map<String, Object>>();
+ SimpleOrderedMap<Map<String, Object>> cfilters = new SimpleOrderedMap<>();
for (CharFilterFactory cfiltfac : cfiltfacs) {
- Map<String, Object> tok = new HashMap<String, Object>();
+ Map<String, Object> tok = new HashMap<>();
String className = cfiltfac.getClass().getName();
tok.put("className", className);
tok.put("args", cfiltfac.getOriginalArgs());
@@ -483,16 +483,16 @@ public class LukeRequestHandler extends
aninfo.add("charFilters", cfilters);
}
- SimpleOrderedMap<Object> tokenizer = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> tokenizer = new SimpleOrderedMap<>();
TokenizerFactory tfac = tchain.getTokenizerFactory();
tokenizer.add("className", tfac.getClass().getName());
tokenizer.add("args", tfac.getOriginalArgs());
aninfo.add("tokenizer", tokenizer);
TokenFilterFactory[] filtfacs = tchain.getTokenFilterFactories();
- SimpleOrderedMap<Map<String, Object>> filters = new SimpleOrderedMap<Map<String, Object>>();
+ SimpleOrderedMap<Map<String, Object>> filters = new SimpleOrderedMap<>();
for (TokenFilterFactory filtfac : filtfacs) {
- Map<String, Object> tok = new HashMap<String, Object>();
+ Map<String, Object> tok = new HashMap<>();
String className = filtfac.getClass().getName();
tok.put("className", className);
tok.put("args", filtfac.getOriginalArgs());
@@ -509,7 +509,7 @@ public class LukeRequestHandler extends
Map<String, List<String>> typeusemap, Map<String, Object> fields,
SchemaField uniqueField, SchemaField f) {
FieldType ft = f.getType();
- SimpleOrderedMap<Object> field = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> field = new SimpleOrderedMap<>();
field.add( "type", ft.getTypeName() );
field.add( "flags", getFieldFlags(f) );
if( f.isRequired() ) {
@@ -532,7 +532,7 @@ public class LukeRequestHandler extends
List<String> v = typeusemap.get( ft.getTypeName() );
if( v == null ) {
- v = new ArrayList<String>();
+ v = new ArrayList<>();
}
v.add( f.getName() );
typeusemap.put( ft.getTypeName(), v );
@@ -550,7 +550,7 @@ public class LukeRequestHandler extends
public static SimpleOrderedMap<Object> getIndexInfo(DirectoryReader reader) throws IOException {
Directory dir = reader.directory();
- SimpleOrderedMap<Object> indexInfo = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> indexInfo = new SimpleOrderedMap<>();
indexInfo.add("numDocs", reader.numDocs());
indexInfo.add("maxDoc", reader.maxDoc());
@@ -638,14 +638,14 @@ public class LukeRequestHandler extends
}
private static List<String> toListOfStrings(SchemaField[] raw) {
- List<String> result = new ArrayList<String>(raw.length);
+ List<String> result = new ArrayList<>(raw.length);
for (SchemaField f : raw) {
result.add(f.getName());
}
return result;
}
private static List<String> toListOfStringDests(List<CopyField> raw) {
- List<String> result = new ArrayList<String>(raw.size());
+ List<String> result = new ArrayList<>(raw.size());
for (CopyField f : raw) {
result.add(f.getDestination().getName());
}
@@ -689,7 +689,7 @@ public class LukeRequestHandler extends
// TODO? should this be a list or a map?
public NamedList<Integer> toNamedList()
{
- NamedList<Integer> nl = new NamedList<Integer>();
+ NamedList<Integer> nl = new NamedList<>();
for( int bucket = 0; bucket <= _maxBucket; bucket++ ) {
nl.add( ""+ (1 << bucket), _buckets[bucket] );
}
@@ -733,12 +733,12 @@ public class LukeRequestHandler extends
public NamedList<Integer> toNamedList( IndexSchema schema )
{
// reverse the list..
- List<TermInfo> aslist = new LinkedList<TermInfo>();
+ List<TermInfo> aslist = new LinkedList<>();
while( size() > 0 ) {
aslist.add( 0, (TermInfo)pop() );
}
- NamedList<Integer> list = new NamedList<Integer>();
+ NamedList<Integer> list = new NamedList<>();
for (TermInfo i : aslist) {
String txt = i.term.text();
SchemaField ft = schema.getFieldOrNull( i.term.field() );
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java Wed Mar 12 18:14:05 2014
@@ -46,10 +46,10 @@ public class PluginInfoHandler extends R
private static SimpleOrderedMap<Object> getSolrInfoBeans( SolrCore core, boolean stats )
{
- SimpleOrderedMap<Object> list = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> list = new SimpleOrderedMap<>();
for (SolrInfoMBean.Category cat : SolrInfoMBean.Category.values())
{
- SimpleOrderedMap<Object> category = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> category = new SimpleOrderedMap<>();
list.add( cat.name(), category );
Map<String, SolrInfoMBean> reg = core.getInfoRegistry();
for (Map.Entry<String,SolrInfoMBean> entry : reg.entrySet()) {
@@ -57,7 +57,7 @@ public class PluginInfoHandler extends R
if (m.getCategory() != cat) continue;
String na = "Not Declared";
- SimpleOrderedMap<Object> info = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> info = new SimpleOrderedMap<>();
category.add( entry.getKey(), info );
info.add( "name", (m.getName() !=null ? m.getName() : na) );
@@ -67,7 +67,7 @@ public class PluginInfoHandler extends R
URL[] urls = m.getDocs();
if ((urls != null) && (urls.length > 0)) {
- ArrayList<String> docs = new ArrayList<String>(urls.length);
+ ArrayList<String> docs = new ArrayList<>(urls.length);
for( URL u : urls ) {
docs.add( u.toExternalForm() );
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java Wed Mar 12 18:14:05 2014
@@ -36,7 +36,7 @@ public class PropertiesRequestHandler ex
Object props = null;
String name = req.getParams().get( "name" );
if( name != null ) {
- NamedList<String> p = new SimpleOrderedMap<String>();
+ NamedList<String> p = new SimpleOrderedMap<>();
p.add( name, System.getProperty(name) );
props = p;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java Wed Mar 12 18:14:05 2014
@@ -113,7 +113,7 @@ public class ShowFileRequestHandler exte
public static Set<String> initHidden(SolrParams invariants) {
- Set<String> hiddenRet = new HashSet<String>();
+ Set<String> hiddenRet = new HashSet<>();
// Build a list of hidden files
if (invariants != null) {
String[] hidden = invariants.getParams(HIDDEN);
@@ -155,13 +155,13 @@ public class ShowFileRequestHandler exte
List<String> children = zkClient.getChildren(adminFile, null, true);
if (children.size() > 0) {
- NamedList<SimpleOrderedMap<Object>> files = new SimpleOrderedMap<SimpleOrderedMap<Object>>();
+ NamedList<SimpleOrderedMap<Object>> files = new SimpleOrderedMap<>();
for (String f : children) {
if (isHiddenFile(req, rsp, f, false, hiddenFiles)) {
continue;
}
- SimpleOrderedMap<Object> fileInfo = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> fileInfo = new SimpleOrderedMap<>();
files.add(f, fileInfo);
List<String> fchildren = zkClient.getChildren(adminFile + "/" + f, null, true);
if (fchildren.size() > 0) {
@@ -216,7 +216,7 @@ public class ShowFileRequestHandler exte
if( adminFile.isDirectory() ) {
// it's really a directory, just go for it.
int basePath = adminFile.getAbsolutePath().length() + 1;
- NamedList<SimpleOrderedMap<Object>> files = new SimpleOrderedMap<SimpleOrderedMap<Object>>();
+ NamedList<SimpleOrderedMap<Object>> files = new SimpleOrderedMap<>();
for( File f : adminFile.listFiles() ) {
String path = f.getAbsolutePath().substring( basePath );
path = path.replace( '\\', '/' ); // normalize slashes
@@ -225,7 +225,7 @@ public class ShowFileRequestHandler exte
continue;
}
- SimpleOrderedMap<Object> fileInfo = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> fileInfo = new SimpleOrderedMap<>();
files.add( path, fileInfo );
if( f.isDirectory() ) {
fileInfo.add( "directory", true );
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java Wed Mar 12 18:14:05 2014
@@ -52,7 +52,7 @@ public class SolrInfoMBeanHandler extend
* Set is guarantee to never be null (but may be empty)
*/
private Set<String> arrayToSet(Object[] arr) {
- HashSet<String> r = new HashSet<String>();
+ HashSet<String> r = new HashSet<>();
if (null == arr) return r;
for (Object o : arr) {
if (null != o) r.add(o.toString());
@@ -114,7 +114,7 @@ public class SolrInfoMBeanHandler extend
protected NamedList<NamedList<NamedList<Object>>> getMBeanInfo(SolrQueryRequest req) {
- NamedList<NamedList<NamedList<Object>>> cats = new NamedList<NamedList<NamedList<Object>>>();
+ NamedList<NamedList<NamedList<Object>>> cats = new NamedList<>();
String[] requestedCats = req.getParams().getParams("cat");
if (null == requestedCats || 0 == requestedCats.length) {
@@ -139,7 +139,7 @@ public class SolrInfoMBeanHandler extend
NamedList<NamedList<Object>> catInfo = cats.get(m.getCategory().name());
if ( null == catInfo ) continue;
- NamedList<Object> mBeanInfo = new SimpleOrderedMap<Object>();
+ NamedList<Object> mBeanInfo = new SimpleOrderedMap<>();
mBeanInfo.add("class", m.getName());
mBeanInfo.add("version", m.getVersion());
mBeanInfo.add("description", m.getDescription());
@@ -148,7 +148,7 @@ public class SolrInfoMBeanHandler extend
// Use an external form
URL[] urls = m.getDocs();
if(urls!=null) {
- List<String> docs = new ArrayList<String>(urls.length);
+ List<String> docs = new ArrayList<>(urls.length);
for(URL url : urls) {
docs.add(url.toExternalForm());
}
@@ -168,7 +168,7 @@ public class SolrInfoMBeanHandler extend
NamedList<NamedList<NamedList<Object>>> now,
boolean includeAll ) {
- NamedList<NamedList<NamedList<Object>>> changed = new NamedList<NamedList<NamedList<Object>>>();
+ NamedList<NamedList<NamedList<Object>>> changed = new NamedList<>();
// Cycle through each category
for(int i=0;i<ref.size();i++) {
@@ -182,7 +182,7 @@ public class SolrInfoMBeanHandler extend
// Something in the category changed
// Now iterate the real beans
- NamedList<NamedList<Object>> cat = new SimpleOrderedMap<NamedList<Object>>();
+ NamedList<NamedList<Object>> cat = new SimpleOrderedMap<>();
for(int j=0;j<ref_cat.size();j++) {
String name = ref_cat.getName(j);
NamedList<Object> ref_bean = ref_cat.get(name);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Wed Mar 12 18:14:05 2014
@@ -112,7 +112,7 @@ public class SystemInfoHandler extends R
* Get system info
*/
private SimpleOrderedMap<Object> getCoreInfo( SolrCore core, IndexSchema schema ) {
- SimpleOrderedMap<Object> info = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> info = new SimpleOrderedMap<>();
info.add( "schema", schema != null ? schema.getSchemaName():"no schema!" );
@@ -126,7 +126,7 @@ public class SystemInfoHandler extends R
info.add( "start", new Date(core.getStartTime()) );
// Solr Home
- SimpleOrderedMap<Object> dirs = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> dirs = new SimpleOrderedMap<>();
dirs.add( "cwd" , new File( System.getProperty("user.dir")).getAbsolutePath() );
dirs.add( "instance", new File( core.getResourceLoader().getInstanceDir() ).getAbsolutePath() );
try {
@@ -150,7 +150,7 @@ public class SystemInfoHandler extends R
* Get system info
*/
public static SimpleOrderedMap<Object> getSystemInfo() {
- SimpleOrderedMap<Object> info = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> info = new SimpleOrderedMap<>();
OperatingSystemMXBean os = ManagementFactory.getOperatingSystemMXBean();
info.add( "name", os.getName() );
@@ -240,7 +240,7 @@ public class SystemInfoHandler extends R
*/
public static SimpleOrderedMap<Object> getJvmInfo()
{
- SimpleOrderedMap<Object> jvm = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> jvm = new SimpleOrderedMap<>();
final String javaVersion = System.getProperty("java.specification.version", "unknown");
final String javaVendor = System.getProperty("java.specification.vendor", "unknown");
@@ -256,16 +256,16 @@ public class SystemInfoHandler extends R
jvm.add( "name", jreVendor + " " + vmName );
// details
- SimpleOrderedMap<Object> java = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> java = new SimpleOrderedMap<>();
java.add( "vendor", javaVendor );
java.add( "name", javaName );
java.add( "version", javaVersion );
jvm.add( "spec", java );
- SimpleOrderedMap<Object> jre = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> jre = new SimpleOrderedMap<>();
jre.add( "vendor", jreVendor );
jre.add( "version", jreVersion );
jvm.add( "jre", jre );
- SimpleOrderedMap<Object> vm = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> vm = new SimpleOrderedMap<>();
vm.add( "vendor", vmVendor );
vm.add( "name", vmName );
vm.add( "version", vmVersion );
@@ -278,8 +278,8 @@ public class SystemInfoHandler extends R
// not thread safe, but could be thread local
DecimalFormat df = new DecimalFormat("#.#", DecimalFormatSymbols.getInstance(Locale.ROOT));
- SimpleOrderedMap<Object> mem = new SimpleOrderedMap<Object>();
- SimpleOrderedMap<Object> raw = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> mem = new SimpleOrderedMap<>();
+ SimpleOrderedMap<Object> raw = new SimpleOrderedMap<>();
long free = runtime.freeMemory();
long max = runtime.maxMemory();
long total = runtime.totalMemory();
@@ -300,7 +300,7 @@ public class SystemInfoHandler extends R
jvm.add("memory", mem);
// JMX properties -- probably should be moved to a different handler
- SimpleOrderedMap<Object> jmx = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> jmx = new SimpleOrderedMap<>();
try{
RuntimeMXBean mx = ManagementFactory.getRuntimeMXBean();
jmx.add( "bootclasspath", mx.getBootClassPath());
@@ -322,7 +322,7 @@ public class SystemInfoHandler extends R
}
private static SimpleOrderedMap<Object> getLuceneInfo() {
- SimpleOrderedMap<Object> info = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> info = new SimpleOrderedMap<>();
Package p = SolrCore.class.getPackage();
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java Wed Mar 12 18:14:05 2014
@@ -38,13 +38,13 @@ public class ThreadDumpHandler extends R
@Override
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws IOException
{
- SimpleOrderedMap<Object> system = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> system = new SimpleOrderedMap<>();
rsp.add( "system", system );
ThreadMXBean tmbean = ManagementFactory.getThreadMXBean();
// Thread Count
- SimpleOrderedMap<Object> nl = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> nl = new SimpleOrderedMap<>();
nl.add( "current",tmbean.getThreadCount() );
nl.add( "peak", tmbean.getPeakThreadCount() );
nl.add( "daemon", tmbean.getDaemonThreadCount() );
@@ -55,7 +55,7 @@ public class ThreadDumpHandler extends R
long[] tids = tmbean.findMonitorDeadlockedThreads();
if (tids != null) {
tinfos = tmbean.getThreadInfo(tids, Integer.MAX_VALUE);
- NamedList<SimpleOrderedMap<Object>> lst = new NamedList<SimpleOrderedMap<Object>>();
+ NamedList<SimpleOrderedMap<Object>> lst = new NamedList<>();
for (ThreadInfo ti : tinfos) {
if (ti != null) {
lst.add( "thread", getThreadInfo( ti, tmbean ) );
@@ -67,7 +67,7 @@ public class ThreadDumpHandler extends R
// Now show all the threads....
tids = tmbean.getAllThreadIds();
tinfos = tmbean.getThreadInfo(tids, Integer.MAX_VALUE);
- NamedList<SimpleOrderedMap<Object>> lst = new NamedList<SimpleOrderedMap<Object>>();
+ NamedList<SimpleOrderedMap<Object>> lst = new NamedList<>();
for (ThreadInfo ti : tinfos) {
if (ti != null) {
lst.add( "thread", getThreadInfo( ti, tmbean ) );
@@ -81,7 +81,7 @@ public class ThreadDumpHandler extends R
//--------------------------------------------------------------------------------
private static SimpleOrderedMap<Object> getThreadInfo( ThreadInfo ti, ThreadMXBean tmbean ) {
- SimpleOrderedMap<Object> info = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> info = new SimpleOrderedMap<>();
long tid = ti.getThreadId();
info.add( "id", tid );
@@ -104,7 +104,7 @@ public class ThreadDumpHandler extends R
}
if (ti.getLockOwnerName() != null) {
- SimpleOrderedMap<Object> owner = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> owner = new SimpleOrderedMap<>();
owner.add( "name", ti.getLockOwnerName() );
owner.add( "id", ti.getLockOwnerId() );
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java Wed Mar 12 18:14:05 2014
@@ -58,7 +58,7 @@ public class DebugComponent extends Sear
private static final Map<Integer, String> stages;
static {
- Map<Integer, String> map = new TreeMap<Integer, String>();
+ Map<Integer, String> map = new TreeMap<>();
map.put(ResponseBuilder.STAGE_START, "START");
map.put(ResponseBuilder.STAGE_PARSE_QUERY, "PARSE_QUERY");
map.put(ResponseBuilder.STAGE_TOP_GROUPS, "TOP_GROUPS");
@@ -106,7 +106,7 @@ public class DebugComponent extends Sear
if (null != rb.getDebugInfo() ) {
if (rb.isDebugQuery() && null != rb.getFilters() ) {
info.add("filter_queries",rb.req.getParams().getParams(FQ));
- List<String> fqs = new ArrayList<String>(rb.getFilters().size());
+ List<String> fqs = new ArrayList<>(rb.getFilters().size());
for (Query fq : rb.getFilters()) {
fqs.add(QueryParsing.toString(fq, rb.req.getSchema()));
}
@@ -175,7 +175,7 @@ public class DebugComponent extends Sear
@SuppressWarnings("unchecked")
NamedList<Object> stageList = (NamedList<Object>) ((NamedList<Object>)rb.getDebugInfo().get("track")).get(stages.get(rb.stage));
if(stageList == null) {
- stageList = new NamedList<Object>();
+ stageList = new NamedList<>();
rb.addDebug(stageList, "track", stages.get(rb.stage));
}
for(ShardResponse response: sreq.responses) {
@@ -184,7 +184,7 @@ public class DebugComponent extends Sear
}
}
- private Set<String> excludeSet = new HashSet<String>(Arrays.asList("explain"));
+ private Set<String> excludeSet = new HashSet<>(Arrays.asList("explain"));
@Override
public void finishStage(ResponseBuilder rb) {
@@ -207,19 +207,19 @@ public class DebugComponent extends Sear
// TODO: lookup won't work for non-string ids... String vs Float
ShardDoc sdoc = rb.resultIds.get(id);
int idx = sdoc.positionInResponse;
- arr[idx] = new NamedList.NamedListEntry<Object>(id, sexplain.getVal(i));
+ arr[idx] = new NamedList.NamedListEntry<>(id, sexplain.getVal(i));
}
}
}
}
if (rb.isDebugResults()) {
- explain = SolrPluginUtils.removeNulls(new SimpleOrderedMap<Object>(arr));
+ explain = SolrPluginUtils.removeNulls(new SimpleOrderedMap<>(arr));
}
if (info == null) {
// No responses were received from shards. Show local query info.
- info = new SimpleOrderedMap<Object>();
+ info = new SimpleOrderedMap<>();
SolrPluginUtils.doStandardQueryDebug(
rb.req, rb.getQueryString(), rb.getQuery(), rb.isDebugQuery(), info);
if (rb.isDebugQuery() && rb.getQparser() != null) {
@@ -243,7 +243,7 @@ public class DebugComponent extends Sear
private NamedList<String> getTrackResponse(ShardResponse shardResponse) {
- NamedList<String> namedList = new NamedList<String>();
+ NamedList<String> namedList = new NamedList<>();
NamedList<Object> responseNL = shardResponse.getSolrResponse().getResponse();
@SuppressWarnings("unchecked")
NamedList<Object> responseHeader = (NamedList<Object>)responseNL.get("responseHeader");
@@ -295,7 +295,7 @@ public class DebugComponent extends Sear
if (source instanceof NamedList && dest instanceof NamedList) {
- NamedList<Object> tmp = new NamedList<Object>();
+ NamedList<Object> tmp = new NamedList<>();
@SuppressWarnings("unchecked")
NamedList<Object> sl = (NamedList<Object>)source;
@SuppressWarnings("unchecked")
@@ -329,7 +329,7 @@ public class DebugComponent extends Sear
}
// merge unlike elements in a list
- List<Object> t = new ArrayList<Object>();
+ List<Object> t = new ArrayList<>();
t.add(dest);
t.add(source);
return t;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java Wed Mar 12 18:14:05 2014
@@ -141,7 +141,7 @@ public class FacetComponent extends Sear
}
if (refinements == null) {
- refinements = new ArrayList<String>();
+ refinements = new ArrayList<>();
}
refinements.add(facetCommand);
@@ -470,7 +470,7 @@ public class FacetComponent extends Sear
dff.needRefinements = true;
List<String> lst = dff._toRefine[shardNum];
if (lst == null) {
- lst = dff._toRefine[shardNum] = new ArrayList<String>();
+ lst = dff._toRefine[shardNum] = new ArrayList<>();
}
lst.add(sfc.name);
}
@@ -526,19 +526,19 @@ public class FacetComponent extends Sear
FacetInfo fi = rb._facetInfo;
- NamedList<Object> facet_counts = new SimpleOrderedMap<Object>();
+ NamedList<Object> facet_counts = new SimpleOrderedMap<>();
- NamedList<Number> facet_queries = new SimpleOrderedMap<Number>();
+ NamedList<Number> facet_queries = new SimpleOrderedMap<>();
facet_counts.add("facet_queries",facet_queries);
for (QueryFacet qf : fi.queryFacets.values()) {
facet_queries.add(qf.getKey(), num(qf.count));
}
- NamedList<Object> facet_fields = new SimpleOrderedMap<Object>();
+ NamedList<Object> facet_fields = new SimpleOrderedMap<>();
facet_counts.add("facet_fields", facet_fields);
for (DistribFieldFacet dff : fi.facets.values()) {
- NamedList<Object> fieldCounts = new NamedList<Object>(); // order is more important for facets
+ NamedList<Object> fieldCounts = new NamedList<>(); // order is more important for facets
facet_fields.add(dff.getKey(), fieldCounts);
ShardFacetCount[] counts;
@@ -634,13 +634,13 @@ public class FacetComponent extends Sear
public LinkedHashMap<String,QueryFacet> queryFacets;
public LinkedHashMap<String,DistribFieldFacet> facets;
public SimpleOrderedMap<SimpleOrderedMap<Object>> dateFacets
- = new SimpleOrderedMap<SimpleOrderedMap<Object>>();
+ = new SimpleOrderedMap<>();
public SimpleOrderedMap<SimpleOrderedMap<Object>> rangeFacets
- = new SimpleOrderedMap<SimpleOrderedMap<Object>>();
+ = new SimpleOrderedMap<>();
void parse(SolrParams params, ResponseBuilder rb) {
- queryFacets = new LinkedHashMap<String,QueryFacet>();
- facets = new LinkedHashMap<String,DistribFieldFacet>();
+ queryFacets = new LinkedHashMap<>();
+ facets = new LinkedHashMap<>();
String[] facetQs = params.getParams(FacetParams.FACET_QUERY);
if (facetQs != null) {
@@ -766,7 +766,7 @@ public class FacetComponent extends Sear
// the max possible count for a missing term for each shard (indexed by shardNum)
public long[] missingMax;
public FixedBitSet[] counted; // a bitset for each shard, keeping track of which terms seen
- public HashMap<String,ShardFacetCount> counts = new HashMap<String,ShardFacetCount>(128);
+ public HashMap<String,ShardFacetCount> counts = new HashMap<>(128);
public int termNum;
public int initialLimit; // how many terms requested in first phase
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java Wed Mar 12 18:14:05 2014
@@ -73,8 +73,8 @@ public class FieldFacetStats {
topLevelReader = searcher.getAtomicReader();
valueSource = facet_sf.getType().getValueSource(facet_sf, null);
- facetStatsValues = new HashMap<String, StatsValues>();
- facetStatsTerms = new ArrayList<HashMap<String, Integer>>();
+ facetStatsValues = new HashMap<>();
+ facetStatsTerms = new ArrayList<>();
}
private StatsValues getStatsValues(String key) throws IOException {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java Wed Mar 12 18:14:05 2014
@@ -182,7 +182,7 @@ public class HighlightComponent extends
String id = hl.getName(i);
ShardDoc sdoc = rb.resultIds.get(id);
int idx = sdoc.positionInResponse;
- arr[idx] = new NamedList.NamedListEntry<Object>(id, hl.getVal(i));
+ arr[idx] = new NamedList.NamedListEntry<>(id, hl.getVal(i));
}
}
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java Wed Mar 12 18:14:05 2014
@@ -68,12 +68,12 @@ public class HttpShardHandler extends Sh
this.httpClient = httpClient;
this.httpShardHandlerFactory = httpShardHandlerFactory;
completionService = httpShardHandlerFactory.newCompletionService();
- pending = new HashSet<Future<ShardResponse>>();
+ pending = new HashSet<>();
// maps "localhost:8983|localhost:7574" to a shuffled List("http://localhost:8983","http://localhost:7574")
// This is primarily to keep track of what order we should use to query the replicas of a shard
// so that we use the same replica for all phases of a distributed request.
- shardToURLs = new HashMap<String,List<String>>();
+ shardToURLs = new HashMap<>();
}
@@ -285,7 +285,7 @@ public class HttpShardHandler extends Sh
if(shardKeys == null) shardKeys = params.get(ShardParams.SHARD_KEYS);//eprecated
// This will be the complete list of slices we need to query for this request.
- slices = new HashMap<String,Slice>();
+ slices = new HashMap<>();
// we need to find out what collections this request is for.
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java Wed Mar 12 18:14:05 2014
@@ -100,7 +100,7 @@ public class MoreLikeThisComponent exten
NamedList<BooleanQuery> bQuery = mlt.getMoreLikeTheseQuery(rb
.getResults().docList);
- NamedList<String> temp = new NamedList<String>();
+ NamedList<String> temp = new NamedList<>();
Iterator<Entry<String,BooleanQuery>> idToQueryIt = bQuery.iterator();
@@ -164,7 +164,7 @@ public class MoreLikeThisComponent exten
// segment ahead of result/response.
if (rb.stage == ResponseBuilder.STAGE_GET_FIELDS
&& rb.req.getParams().getBool(COMPONENT_NAME, false)) {
- Map<Object,SolrDocumentList> tempResults = new LinkedHashMap<Object,SolrDocumentList>();
+ Map<Object,SolrDocumentList> tempResults = new LinkedHashMap<>();
int mltcount = rb.req.getParams().getInt(MoreLikeThisParams.DOC_COUNT, 5);
String keyName = rb.req.getSchema().getUniqueKeyField().getName();
@@ -221,8 +221,8 @@ public class MoreLikeThisComponent exten
*/
NamedList<SolrDocumentList> buildMoreLikeThisNamed(
Map<Object,SolrDocumentList> allMlt, Map<Object,ShardDoc> resultIds) {
- NamedList<SolrDocumentList> result = new NamedList<SolrDocumentList>();
- TreeMap<Integer,Object> sortingMap = new TreeMap<Integer,Object>();
+ NamedList<SolrDocumentList> result = new NamedList<>();
+ TreeMap<Integer,Object> sortingMap = new TreeMap<>();
for (Entry<Object,ShardDoc> next : resultIds.entrySet()) {
sortingMap.put(next.getValue().positionInResponse, next.getKey());
}
@@ -241,10 +241,10 @@ public class MoreLikeThisComponent exten
public SolrDocumentList mergeSolrDocumentList(SolrDocumentList one,
SolrDocumentList two, int maxSize, String idField) {
- List<SolrDocument> l = new ArrayList<SolrDocument>();
+ List<SolrDocument> l = new ArrayList<>();
// De-dup records sets. Shouldn't happen if indexed correctly.
- Map<String,SolrDocument> map = new HashMap<String,SolrDocument>();
+ Map<String,SolrDocument> map = new HashMap<>();
for (SolrDocument doc : one) {
Object id = doc.getFieldValue(idField);
assert id != null : doc.toString();
@@ -254,7 +254,7 @@ public class MoreLikeThisComponent exten
map.put(doc.getFieldValue(idField).toString(), doc);
}
- l = new ArrayList<SolrDocument>(map.values());
+ l = new ArrayList<>(map.values());
// Comparator to sort docs based on score. null scores/docs are set to 0.
@@ -352,12 +352,12 @@ public class MoreLikeThisComponent exten
IndexSchema schema = searcher.getSchema();
MoreLikeThisHandler.MoreLikeThisHelper mltHelper = new MoreLikeThisHandler.MoreLikeThisHelper(
p, searcher);
- NamedList<DocList> mlt = new SimpleOrderedMap<DocList>();
+ NamedList<DocList> mlt = new SimpleOrderedMap<>();
DocIterator iterator = docs.iterator();
SimpleOrderedMap<Object> dbg = null;
if (rb.isDebug()) {
- dbg = new SimpleOrderedMap<Object>();
+ dbg = new SimpleOrderedMap<>();
}
while (iterator.hasNext()) {
@@ -369,12 +369,12 @@ public class MoreLikeThisComponent exten
mlt.add(name, sim.docList);
if (dbg != null) {
- SimpleOrderedMap<Object> docDbg = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> docDbg = new SimpleOrderedMap<>();
docDbg.add("rawMLTQuery", mltHelper.getRawMLTQuery().toString());
docDbg
.add("boostedMLTQuery", mltHelper.getBoostedMLTQuery().toString());
docDbg.add("realMLTQuery", mltHelper.getRealMLTQuery().toString());
- SimpleOrderedMap<Object> explains = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> explains = new SimpleOrderedMap<>();
DocIterator mltIte = sim.docList.iterator();
while (mltIte.hasNext()) {
int mltid = mltIte.nextDoc();
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java Wed Mar 12 18:14:05 2014
@@ -60,7 +60,7 @@ public class PivotFacetHelper extends Si
if (!rb.doFacets || pivots == null)
return null;
- SimpleOrderedMap<List<NamedList<Object>>> pivotResponse = new SimpleOrderedMap<List<NamedList<Object>>>();
+ SimpleOrderedMap<List<NamedList<Object>>> pivotResponse = new SimpleOrderedMap<>();
for (String pivot : pivots) {
//ex: pivot == "features,cat" or even "{!ex=mytag}features,cat"
try {
@@ -79,7 +79,7 @@ public class PivotFacetHelper extends Si
String field = fields[0];
String subField = fields[1];
- Deque<String> fnames = new LinkedList<String>();
+ Deque<String> fnames = new LinkedList<>();
for( int i=fields.length-1; i>1; i-- ) {
fnames.push( fields[i] );
}
@@ -106,7 +106,7 @@ public class PivotFacetHelper extends Si
String nextField = fnames.poll();
- List<NamedList<Object>> values = new ArrayList<NamedList<Object>>( superFacets.size() );
+ List<NamedList<Object>> values = new ArrayList<>( superFacets.size() );
for (Map.Entry<String, Integer> kv : superFacets) {
// Only sub-facet if parent facet has positive count - still may not be any values for the sub-field though
if (kv.getValue() >= minMatch) {
@@ -118,7 +118,7 @@ public class PivotFacetHelper extends Si
// constructing Term objects used in TermQueries that may be cached.
BytesRef termval = null;
- SimpleOrderedMap<Object> pivot = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> pivot = new SimpleOrderedMap<>();
pivot.add( "field", field );
if (null == fieldValue) {
pivot.add( "value", null );
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java Wed Mar 12 18:14:05 2014
@@ -163,7 +163,7 @@ public class QueryComponent extends Sear
if (fqs!=null && fqs.length!=0) {
List<Query> filters = rb.getFilters();
// if filters already exists, make a copy instead of modifying the original
- filters = filters == null ? new ArrayList<Query>(fqs.length) : new ArrayList<Query>(filters);
+ filters = filters == null ? new ArrayList<Query>(fqs.length) : new ArrayList<>(filters);
for (String fq : fqs) {
if (fq != null && fq.trim().length()!=0) {
QParser fqp = QParser.getParser(fq, null, req);
@@ -291,7 +291,7 @@ public class QueryComponent extends Sear
res.docList = new DocSlice(0, docs, luceneIds, null, docs, 0);
if (rb.isNeedDocSet()) {
// TODO: create a cache for this!
- List<Query> queries = new ArrayList<Query>();
+ List<Query> queries = new ArrayList<>();
queries.add(rb.getQuery());
List<Query> filters = rb.getFilters();
if (filters != null) queries.addAll(filters);
@@ -353,9 +353,9 @@ public class QueryComponent extends Sear
topGroupsParam = new String[0];
}
- List<SearchGroup<BytesRef>> topGroups = new ArrayList<SearchGroup<BytesRef>>(topGroupsParam.length);
+ List<SearchGroup<BytesRef>> topGroups = new ArrayList<>(topGroupsParam.length);
for (String topGroup : topGroupsParam) {
- SearchGroup<BytesRef> searchGroup = new SearchGroup<BytesRef>();
+ SearchGroup<BytesRef> searchGroup = new SearchGroup<>();
if (!topGroup.equals(TopGroupsShardRequestFactory.GROUP_NULL_VALUE)) {
searchGroup.groupValue = new BytesRef(searcher.getSchema().getField(field).getType().readableToIndexed(topGroup));
}
@@ -488,7 +488,7 @@ public class QueryComponent extends Sear
// TODO: See SOLR-5595
boolean fsv = req.getParams().getBool(ResponseBuilder.FIELD_SORT_VALUES,false);
if(fsv){
- NamedList<Object[]> sortVals = new NamedList<Object[]>(); // order is important for the sort fields
+ NamedList<Object[]> sortVals = new NamedList<>(); // order is important for the sort fields
IndexReaderContext topReaderContext = searcher.getTopReaderContext();
List<AtomicReaderContext> leaves = topReaderContext.leaves();
AtomicReaderContext currentLeaf = null;
@@ -714,7 +714,7 @@ public class QueryComponent extends Sear
for (String field : groupSpec.getFields()) {
rb.mergedTopGroups.put(field, new TopGroups(null, null, 0, 0, new GroupDocs[]{}, Float.NaN));
}
- rb.resultIds = new HashMap<Object, ShardDoc>();
+ rb.resultIds = new HashMap<>();
}
EndResultTransformer.SolrDocumentSource solrDocumentSource = new EndResultTransformer.SolrDocumentSource() {
@@ -736,7 +736,7 @@ public class QueryComponent extends Sear
} else {
return;
}
- Map<String, Object> combinedMap = new LinkedHashMap<String, Object>();
+ Map<String, Object> combinedMap = new LinkedHashMap<>();
combinedMap.putAll(rb.mergedTopGroups);
combinedMap.putAll(rb.mergedQueryCommandResults);
endResultTransformer.transform(combinedMap, rb, solrDocumentSource);
@@ -835,7 +835,7 @@ public class QueryComponent extends Sear
// id to shard mapping, to eliminate any accidental dups
- HashMap<Object,String> uniqueDoc = new HashMap<Object,String>();
+ HashMap<Object,String> uniqueDoc = new HashMap<>();
// Merge the docs via a priority queue so we don't have to sort *all* of the
// documents... we only need to order the top (rows+start)
@@ -844,7 +844,7 @@ public class QueryComponent extends Sear
NamedList<Object> shardInfo = null;
if(rb.req.getParams().getBool(ShardParams.SHARDS_INFO, false)) {
- shardInfo = new SimpleOrderedMap<Object>();
+ shardInfo = new SimpleOrderedMap<>();
rb.rsp.getValues().add(ShardParams.SHARDS_INFO,shardInfo);
}
@@ -855,7 +855,7 @@ public class QueryComponent extends Sear
SolrDocumentList docs = null;
if(shardInfo!=null) {
- SimpleOrderedMap<Object> nl = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> nl = new SimpleOrderedMap<>();
if (srsp.getException() != null) {
Throwable t = srsp.getException();
@@ -952,7 +952,7 @@ public class QueryComponent extends Sear
int resultSize = queue.size() - ss.getOffset();
resultSize = Math.max(0, resultSize); // there may not be any docs in range
- Map<Object,ShardDoc> resultIds = new HashMap<Object,ShardDoc>();
+ Map<Object,ShardDoc> resultIds = new HashMap<>();
for (int i=resultSize-1; i>=0; i--) {
ShardDoc shardDoc = queue.pop();
shardDoc.positionInResponse = i;
@@ -1021,7 +1021,7 @@ public class QueryComponent extends Sear
}
}
SortField[] sortFields = lastCursorMark.getSortSpec().getSort().getSort();
- List<Object> nextCursorMarkValues = new ArrayList<Object>(sortFields.length);
+ List<Object> nextCursorMarkValues = new ArrayList<>(sortFields.length);
for (SortField sf : sortFields) {
if (sf.getType().equals(SortField.Type.SCORE)) {
assert null != lastDoc.score : "lastDoc has null score";
@@ -1084,11 +1084,11 @@ public class QueryComponent extends Sear
// unless those requests always go to the final destination shard
// for each shard, collect the documents for that shard.
- HashMap<String, Collection<ShardDoc>> shardMap = new HashMap<String,Collection<ShardDoc>>();
+ HashMap<String, Collection<ShardDoc>> shardMap = new HashMap<>();
for (ShardDoc sdoc : rb.resultIds.values()) {
Collection<ShardDoc> shardDocs = shardMap.get(sdoc.shard);
if (shardDocs == null) {
- shardDocs = new ArrayList<ShardDoc>();
+ shardDocs = new ArrayList<>();
shardMap.put(sdoc.shard, shardDocs);
}
shardDocs.add(sdoc);
@@ -1119,7 +1119,7 @@ public class QueryComponent extends Sear
sreq.params.add(CommonParams.FL, uniqueField.getName());
}
- ArrayList<String> ids = new ArrayList<String>(shardDocs.size());
+ ArrayList<String> ids = new ArrayList<>(shardDocs.size());
for (ShardDoc shardDoc : shardDocs) {
// TODO: depending on the type, we may need more tha a simple toString()?
ids.add(shardDoc.id.toString());
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java Wed Mar 12 18:14:05 2014
@@ -114,7 +114,7 @@ public class QueryElevationComponent ext
// The key is null if loaded from the config directory, and
// is never re-loaded.
final Map<IndexReader, Map<String, ElevationObj>> elevationCache =
- new WeakHashMap<IndexReader, Map<String, ElevationObj>>();
+ new WeakHashMap<>();
class ElevationObj {
final String text;
@@ -128,12 +128,12 @@ public class QueryElevationComponent ext
ElevationObj(String qstr, List<String> elevate, List<String> exclude) throws IOException {
this.text = qstr;
this.analyzed = getAnalyzedQuery(this.text);
- this.ids = new HashSet<String>();
- this.excludeIds = new HashSet<String>();
+ this.ids = new HashSet<>();
+ this.excludeIds = new HashSet<>();
this.include = new BooleanQuery();
this.include.setBoost(0);
- this.priority = new HashMap<BytesRef, Integer>();
+ this.priority = new HashMap<>();
int max = elevate.size() + 5;
for (String id : elevate) {
id = idSchemaFT.readableToIndexed(id);
@@ -280,7 +280,7 @@ public class QueryElevationComponent ext
//load up the elevation map
private Map<String, ElevationObj> loadElevationMap(Config cfg) throws IOException {
XPath xpath = XPathFactory.newInstance().newXPath();
- Map<String, ElevationObj> map = new HashMap<String, ElevationObj>();
+ Map<String, ElevationObj> map = new HashMap<>();
NodeList nodes = (NodeList) cfg.evaluate("elevate/query", XPathConstants.NODESET);
for (int i = 0; i < nodes.getLength(); i++) {
Node node = nodes.item(i);
@@ -294,8 +294,8 @@ public class QueryElevationComponent ext
"query requires '<doc .../>' child");
}
- ArrayList<String> include = new ArrayList<String>();
- ArrayList<String> exclude = new ArrayList<String>();
+ ArrayList<String> include = new ArrayList<>();
+ ArrayList<String> exclude = new ArrayList<>();
for (int j = 0; j < children.getLength(); j++) {
Node child = children.item(j);
String id = DOMUtil.getAttr(child, "id", "missing 'id'");
@@ -334,7 +334,7 @@ public class QueryElevationComponent ext
Map<String, ElevationObj> elev = elevationCache.get(reader);
if (elev == null) {
- elev = new HashMap<String, ElevationObj>();
+ elev = new HashMap<>();
elevationCache.put(reader, elev);
}
ElevationObj obj = new ElevationObj(query, Arrays.asList(ids), Arrays.asList(ex));
@@ -467,14 +467,14 @@ public class QueryElevationComponent ext
List<String> match = null;
if (booster != null) {
// Extract the elevated terms into a list
- match = new ArrayList<String>(booster.priority.size());
+ match = new ArrayList<>(booster.priority.size());
for (Object o : booster.include.clauses()) {
TermQuery tq = (TermQuery) ((BooleanClause) o).getQuery();
match.add(tq.getTerm().text());
}
}
- SimpleOrderedMap<Object> dbg = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> dbg = new SimpleOrderedMap<>();
dbg.add("q", qstr);
dbg.add("match", match);
if (rb.isDebugQuery()) {
@@ -494,8 +494,8 @@ public class QueryElevationComponent ext
SortField[] currentSorts = current.getSort().getSort();
List<SchemaField> currentFields = current.getSchemaFields();
- ArrayList<SortField> sorts = new ArrayList<SortField>(currentSorts.length + 1);
- List<SchemaField> fields = new ArrayList<SchemaField>(currentFields.size() + 1);
+ ArrayList<SortField> sorts = new ArrayList<>(currentSorts.length + 1);
+ List<SchemaField> fields = new ArrayList<>(currentFields.size() + 1);
// Perhaps force it to always sort by score
if (force && currentSorts[0].getType() != SortField.Type.SCORE) {
@@ -572,7 +572,7 @@ public class QueryElevationComponent ext
private int topVal;
private TermsEnum termsEnum;
private DocsEnum docsEnum;
- Set<String> seen = new HashSet<String>(elevations.ids.size());
+ Set<String> seen = new HashSet<>(elevations.ids.size());
@Override
public int compare(int slot1, int slot2) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java Wed Mar 12 18:14:05 2014
@@ -109,7 +109,7 @@ public class RealTimeGetComponent extend
String[] allIds = id==null ? new String[0] : id;
if (ids != null) {
- List<String> lst = new ArrayList<String>();
+ List<String> lst = new ArrayList<>();
for (String s : allIds) {
lst.add(s);
}
@@ -303,7 +303,7 @@ public class RealTimeGetComponent extend
if (sf != null && schema.isCopyFieldTarget(sf)) continue;
if (sf != null && sf.multiValued()) {
- List<Object> vals = new ArrayList<Object>();
+ List<Object> vals = new ArrayList<>();
vals.add( f );
out.setField( f.name(), vals );
}
@@ -352,7 +352,7 @@ public class RealTimeGetComponent extend
return ResponseBuilder.STAGE_DONE;
}
- List<String> allIds = new ArrayList<String>();
+ List<String> allIds = new ArrayList<>();
if (id1 != null) {
for (String s : id1) {
allIds.add(s);
@@ -377,13 +377,13 @@ public class RealTimeGetComponent extend
DocCollection coll = clusterState.getCollection(collection);
- Map<String, List<String>> sliceToId = new HashMap<String, List<String>>();
+ Map<String, List<String>> sliceToId = new HashMap<>();
for (String id : allIds) {
Slice slice = coll.getRouter().getTargetSlice(id, null, params, coll);
List<String> idsForShard = sliceToId.get(slice.getName());
if (idsForShard == null) {
- idsForShard = new ArrayList<String>(2);
+ idsForShard = new ArrayList<>(2);
sliceToId.put(slice.getName(), idsForShard);
}
idsForShard.add(id);
@@ -580,7 +580,7 @@ public class RealTimeGetComponent extend
List<String> versions = StrUtils.splitSmart(versionsStr, ",", true);
- List<Object> updates = new ArrayList<Object>(versions.size());
+ List<Object> updates = new ArrayList<>(versions.size());
long minVersion = Long.MAX_VALUE;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java Wed Mar 12 18:14:05 2014
@@ -168,12 +168,12 @@ public class ResponseBuilder
SimpleOrderedMap<List<NamedList<Object>>> _pivots;
// Context fields for grouping
- public final Map<String, Collection<SearchGroup<BytesRef>>> mergedSearchGroups = new HashMap<String, Collection<SearchGroup<BytesRef>>>();
- public final Map<String, Integer> mergedGroupCounts = new HashMap<String, Integer>();
- public final Map<String, Map<SearchGroup<BytesRef>, Set<String>>> searchGroupToShards = new HashMap<String, Map<SearchGroup<BytesRef>, Set<String>>>();
- public final Map<String, TopGroups<BytesRef>> mergedTopGroups = new HashMap<String, TopGroups<BytesRef>>();
- public final Map<String, QueryCommandResult> mergedQueryCommandResults = new HashMap<String, QueryCommandResult>();
- public final Map<Object, SolrDocument> retrievedDocuments = new HashMap<Object, SolrDocument>();
+ public final Map<String, Collection<SearchGroup<BytesRef>>> mergedSearchGroups = new HashMap<>();
+ public final Map<String, Integer> mergedGroupCounts = new HashMap<>();
+ public final Map<String, Map<SearchGroup<BytesRef>, Set<String>>> searchGroupToShards = new HashMap<>();
+ public final Map<String, TopGroups<BytesRef>> mergedTopGroups = new HashMap<>();
+ public final Map<String, QueryCommandResult> mergedQueryCommandResults = new HashMap<>();
+ public final Map<Object, SolrDocument> retrievedDocuments = new HashMap<>();
public int totalHitCount; // Hit count used when distributed grouping is performed.
// Used for timeAllowed parameter. First phase elapsed time is subtracted from the time allowed for the second phase.
public int firstPhaseElapsedTime;
@@ -185,14 +185,14 @@ public class ResponseBuilder
public void addDebugInfo( String name, Object val )
{
if( debugInfo == null ) {
- debugInfo = new SimpleOrderedMap<Object>();
+ debugInfo = new SimpleOrderedMap<>();
}
debugInfo.add( name, val );
}
public void addDebug(Object val, String... path) {
if( debugInfo == null ) {
- debugInfo = new SimpleOrderedMap<Object>();
+ debugInfo = new SimpleOrderedMap<>();
}
NamedList<Object> target = debugInfo;
@@ -200,7 +200,7 @@ public class ResponseBuilder
String elem = path[i];
NamedList<Object> newTarget = (NamedList<Object>)debugInfo.get(elem);
if (newTarget == null) {
- newTarget = new SimpleOrderedMap<Object>();
+ newTarget = new SimpleOrderedMap<>();
target.add(elem, newTarget);
}
target = newTarget;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java Wed Mar 12 18:14:05 2014
@@ -64,7 +64,7 @@ public class SearchHandler extends Reque
protected List<String> getDefaultComponents()
{
- ArrayList<String> names = new ArrayList<String>(6);
+ ArrayList<String> names = new ArrayList<>(6);
names.add( QueryComponent.COMPONENT_NAME );
names.add( FacetComponent.COMPONENT_NAME );
names.add( MoreLikeThisComponent.COMPONENT_NAME );
@@ -125,7 +125,7 @@ public class SearchHandler extends Reque
}
// Build the component list
- components = new ArrayList<SearchComponent>( list.size() );
+ components = new ArrayList<>( list.size() );
DebugComponent dbgCmp = null;
for(String c : list){
SearchComponent comp = core.getSearchComponent( c );
@@ -236,9 +236,9 @@ public class SearchHandler extends Reque
// a distributed request
if (rb.outgoing == null) {
- rb.outgoing = new LinkedList<ShardRequest>();
+ rb.outgoing = new LinkedList<>();
}
- rb.finished = new ArrayList<ShardRequest>();
+ rb.finished = new ArrayList<>();
int nextStage = 0;
do {
@@ -262,7 +262,7 @@ public class SearchHandler extends Reque
if (sreq.actualShards==ShardRequest.ALL_SHARDS) {
sreq.actualShards = rb.shards;
}
- sreq.responses = new ArrayList<ShardResponse>();
+ sreq.responses = new ArrayList<>();
// TODO: map from shard to address[]
for (String shard : sreq.actualShards) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java Wed Mar 12 18:14:05 2014
@@ -110,7 +110,7 @@ class ShardFieldSortedHitQueue extends P
protected SortField[] fields;
/** The order of these fieldNames should correspond to the order of sort field values retrieved from the shard */
- protected List<String> fieldNames = new ArrayList<String>();
+ protected List<String> fieldNames = new ArrayList<>();
public ShardFieldSortedHitQueue(SortField[] fields, int size, IndexSearcher searcher) {
super(size);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/ShardRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/ShardRequest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/ShardRequest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/ShardRequest.java Wed Mar 12 18:14:05 2014
@@ -48,7 +48,7 @@ public class ShardRequest {
/** list of responses... filled out by framework */
- public List<ShardResponse> responses = new ArrayList<ShardResponse>();
+ public List<ShardResponse> responses = new ArrayList<>();
/** actual shards to send the request to, filled out by framework */
public String[] actualShards;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java Wed Mar 12 18:14:05 2014
@@ -101,7 +101,7 @@ public class SpellCheckComponent extends
/**
* Key is the dictionary, value is the SpellChecker for that dictionary name
*/
- protected Map<String, SolrSpellChecker> spellCheckers = new ConcurrentHashMap<String, SolrSpellChecker>();
+ protected Map<String, SolrSpellChecker> spellCheckers = new ConcurrentHashMap<>();
protected QueryConverter queryConverter;
@@ -381,7 +381,7 @@ public class SpellCheckComponent extends
mergeData.origVsSuggestion.put(suggestion.getToken(), suggestion);
HashSet<String> suggested = mergeData.origVsSuggested.get(suggestion.getToken());
if (suggested == null) {
- suggested = new HashSet<String>();
+ suggested = new HashSet<>();
mergeData.origVsSuggested.put(suggestion.getToken(), suggested);
}
@@ -471,7 +471,7 @@ public class SpellCheckComponent extends
}
private Collection<Token> getTokens(String q, Analyzer analyzer) throws IOException {
- Collection<Token> result = new ArrayList<Token>();
+ Collection<Token> result = new ArrayList<>();
assert analyzer != null;
TokenStream ts = analyzer.tokenStream("", q);
try {
@@ -559,7 +559,7 @@ public class SpellCheckComponent extends
Token inputToken = entry.getKey();
String tokenString = new String(inputToken.buffer(), 0, inputToken
.length());
- Map<String,Integer> theSuggestions = new LinkedHashMap<String,Integer>(
+ Map<String,Integer> theSuggestions = new LinkedHashMap<>(
entry.getValue());
Iterator<String> sugIter = theSuggestions.keySet().iterator();
while (sugIter.hasNext()) {
@@ -589,7 +589,7 @@ public class SpellCheckComponent extends
suggestionList.add("origFreq", spellingResult
.getTokenFrequency(inputToken));
- ArrayList<SimpleOrderedMap> sugs = new ArrayList<SimpleOrderedMap>();
+ ArrayList<SimpleOrderedMap> sugs = new ArrayList<>();
suggestionList.add("suggestion", sugs);
for (Map.Entry<String,Integer> suggEntry : theSuggestions.entrySet()) {
SimpleOrderedMap sugEntry = new SimpleOrderedMap();
@@ -664,7 +664,7 @@ public class SpellCheckComponent extends
}
}
- Map<String, QueryConverter> queryConverters = new HashMap<String, QueryConverter>();
+ Map<String, QueryConverter> queryConverters = new HashMap<>();
core.initPlugins(queryConverters,QueryConverter.class);
//ensure that there is at least one query converter defined
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SpellCheckMergeData.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SpellCheckMergeData.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SpellCheckMergeData.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SpellCheckMergeData.java Wed Mar 12 18:14:05 2014
@@ -28,16 +28,16 @@ import org.apache.solr.spelling.SpellChe
public class SpellCheckMergeData {
//original token -> corresponding Suggestion object (keep track of start,end)
- public Map<String, SpellCheckResponse.Suggestion> origVsSuggestion = new HashMap<String, SpellCheckResponse.Suggestion>();
+ public Map<String, SpellCheckResponse.Suggestion> origVsSuggestion = new HashMap<>();
// original token string -> summed up frequency
- public Map<String, Integer> origVsFreq = new HashMap<String, Integer>();
+ public Map<String, Integer> origVsFreq = new HashMap<>();
// original token string -> # of shards reporting it as misspelled
- public Map<String, Integer> origVsShards = new HashMap<String, Integer>();
+ public Map<String, Integer> origVsShards = new HashMap<>();
// original token string -> set of alternatives
// must preserve order because collation algorithm can only work in-order
- public Map<String, HashSet<String>> origVsSuggested = new LinkedHashMap<String, HashSet<String>>();
+ public Map<String, HashSet<String>> origVsSuggested = new LinkedHashMap<>();
// alternative string -> corresponding SuggestWord object
- public Map<String, SuggestWord> suggestedVsWord = new HashMap<String, SuggestWord>();
- public Map<String, SpellCheckCollation> collations = new HashMap<String, SpellCheckCollation>();
+ public Map<String, SuggestWord> suggestedVsWord = new HashMap<>();
+ public Map<String, SpellCheckCollation> collations = new HashMap<>();
public int totalNumberShardResponses = 0;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java Wed Mar 12 18:14:05 2014
@@ -133,8 +133,8 @@ public class StatsComponent extends Sear
StatsInfo si = rb._statsInfo;
- NamedList<NamedList<Object>> stats = new SimpleOrderedMap<NamedList<Object>>();
- NamedList<Object> stats_fields = new SimpleOrderedMap<Object>();
+ NamedList<NamedList<Object>> stats = new SimpleOrderedMap<>();
+ NamedList<Object> stats_fields = new SimpleOrderedMap<>();
stats.add("stats_fields", stats_fields);
for (String field : si.statsFields.keySet()) {
NamedList stv = si.statsFields.get(field).getStatsValues();
@@ -171,7 +171,7 @@ class StatsInfo {
Map<String, StatsValues> statsFields;
void parse(SolrParams params, ResponseBuilder rb) {
- statsFields = new HashMap<String, StatsValues>();
+ statsFields = new HashMap<>();
String[] statsFs = params.getParams(StatsParams.STATS_FIELD);
if (statsFs != null) {
@@ -205,13 +205,13 @@ class SimpleStats {
}
public NamedList<Object> getStatsCounts() throws IOException {
- NamedList<Object> res = new SimpleOrderedMap<Object>();
+ NamedList<Object> res = new SimpleOrderedMap<>();
res.add("stats_fields", getStatsFields());
return res;
}
public NamedList<Object> getStatsFields() throws IOException {
- NamedList<Object> res = new SimpleOrderedMap<Object>();
+ NamedList<Object> res = new SimpleOrderedMap<>();
String[] statsFs = params.getParams(StatsParams.STATS_FIELD);
boolean isShard = params.getBool(ShardParams.IS_SHARD, false);
if (null != statsFs) {
@@ -249,7 +249,7 @@ class SimpleStats {
final StatsValues allstats = StatsValuesFactory.createStatsValues(sf, calcDistinct);
- List<FieldFacetStats> facetStats = new ArrayList<FieldFacetStats>();
+ List<FieldFacetStats> facetStats = new ArrayList<>();
for( String facetField : facet ) {
SchemaField fsf = schema.getField(facetField);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java Wed Mar 12 18:14:05 2014
@@ -90,12 +90,12 @@ abstract class AbstractStatsValues<T> im
protected boolean calcDistinct = false;
// facetField facetValue
- protected Map<String, Map<String, StatsValues>> facets = new HashMap<String, Map<String, StatsValues>>();
+ protected Map<String, Map<String, StatsValues>> facets = new HashMap<>();
protected AbstractStatsValues(SchemaField sf, boolean calcDistinct) {
this.sf = sf;
this.ft = sf.getType();
- this.distinctValues = new TreeSet<T>();
+ this.distinctValues = new TreeSet<>();
this.calcDistinct = calcDistinct;
}
@@ -124,7 +124,7 @@ abstract class AbstractStatsValues<T> im
NamedList vals = (NamedList) f.getVal(i);
Map<String, StatsValues> addTo = facets.get(field);
if (addTo == null) {
- addTo = new HashMap<String, StatsValues>();
+ addTo = new HashMap<>();
facets.put(field, addTo);
}
for (int j = 0; j < vals.size(); j++) {
@@ -187,7 +187,7 @@ abstract class AbstractStatsValues<T> im
*/
@Override
public NamedList<?> getStatsValues() {
- NamedList<Object> res = new SimpleOrderedMap<Object>();
+ NamedList<Object> res = new SimpleOrderedMap<>();
res.add("min", min);
res.add("max", max);
@@ -201,9 +201,9 @@ abstract class AbstractStatsValues<T> im
addTypeSpecificStats(res);
// add the facet stats
- NamedList<NamedList<?>> nl = new SimpleOrderedMap<NamedList<?>>();
+ NamedList<NamedList<?>> nl = new SimpleOrderedMap<>();
for (Map.Entry<String, Map<String, StatsValues>> entry : facets.entrySet()) {
- NamedList<NamedList<?>> nl2 = new SimpleOrderedMap<NamedList<?>>();
+ NamedList<NamedList<?>> nl2 = new SimpleOrderedMap<>();
nl.add(entry.getKey(), nl2);
for (Map.Entry<String, StatsValues> e2 : entry.getValue().entrySet()) {
nl2.add(e2.getKey(), e2.getValue().getStatsValues());
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java Wed Mar 12 18:14:05 2014
@@ -80,7 +80,7 @@ public class SuggestComponent extends Se
/**
* Key is the dictionary name used in SolrConfig, value is the corresponding {@link SolrSuggester}
*/
- protected Map<String, SolrSuggester> suggesters = new ConcurrentHashMap<String, SolrSuggester>();
+ protected Map<String, SolrSuggester> suggesters = new ConcurrentHashMap<>();
/** Container for various labels used in the responses generated by this component */
private static class SuggesterResultLabels {
@@ -211,7 +211,7 @@ public class SuggestComponent extends Se
if (!buildAll && !reloadAll) {
throw ex;
} else {
- querySuggesters = new HashSet<SolrSuggester>();
+ querySuggesters = new HashSet<>();
}
}
@@ -227,7 +227,7 @@ public class SuggestComponent extends Se
int count = params.getInt(SUGGEST_COUNT, 1);
SuggesterOptions options = new SuggesterOptions(new CharsRef(query), count);
Map<String, SimpleOrderedMap<NamedList<Object>>> namedListResults =
- new HashMap<String, SimpleOrderedMap<NamedList<Object>>>();
+ new HashMap<>();
for (SolrSuggester suggester : querySuggesters) {
SuggesterResult suggesterResult = suggester.getSuggestions(options);
toNamedList(suggesterResult, namedListResults);
@@ -266,7 +266,7 @@ public class SuggestComponent extends Se
// Merge Shard responses
SuggesterResult suggesterResult = merge(suggesterResults, count);
Map<String, SimpleOrderedMap<NamedList<Object>>> namedListResults =
- new HashMap<String, SimpleOrderedMap<NamedList<Object>>>();
+ new HashMap<>();
toNamedList(suggesterResult, namedListResults);
rb.rsp.add(SuggesterResultLabels.SUGGEST, namedListResults);
@@ -281,7 +281,7 @@ public class SuggestComponent extends Se
private static SuggesterResult merge(List<SuggesterResult> suggesterResults, int count) {
SuggesterResult result = new SuggesterResult();
Set<String> allTokens = new HashSet<>();
- Set<String> suggesterNames = new HashSet<String>();
+ Set<String> suggesterNames = new HashSet<>();
// collect all tokens
for (SuggesterResult shardResult : suggesterResults) {
@@ -305,7 +305,7 @@ public class SuggestComponent extends Se
resultQueue.insertWithOverflow(res);
}
}
- List<LookupResult> sortedSuggests = new LinkedList<LookupResult>();
+ List<LookupResult> sortedSuggests = new LinkedList<>();
Collections.addAll(sortedSuggests, resultQueue.getResults());
result.add(suggesterName, token, sortedSuggests);
}
@@ -325,7 +325,7 @@ public class SuggestComponent extends Se
@Override
public NamedList getStatistics() {
- NamedList<String> stats = new SimpleOrderedMap<String>();
+ NamedList<String> stats = new SimpleOrderedMap<>();
stats.add("totalSizeInBytes", String.valueOf(sizeInBytes()));
for (Map.Entry<String, SolrSuggester> entry : suggesters.entrySet()) {
SolrSuggester suggester = entry.getValue();
@@ -344,7 +344,7 @@ public class SuggestComponent extends Se
}
private Set<SolrSuggester> getSuggesters(SolrParams params) {
- Set<SolrSuggester> solrSuggesters = new HashSet<SolrSuggester>();
+ Set<SolrSuggester> solrSuggesters = new HashSet<>();
for(String suggesterName : getSuggesterNames(params)) {
SolrSuggester curSuggester = suggesters.get(suggesterName);
if (curSuggester != null) {
@@ -361,7 +361,7 @@ public class SuggestComponent extends Se
}
private Set<String> getSuggesterNames(SolrParams params) {
- Set<String> suggesterNames = new HashSet<String>();
+ Set<String> suggesterNames = new HashSet<>();
String[] suggesterNamesFromParams = params.getParams(SUGGEST_DICT);
if (suggesterNamesFromParams == null) {
suggesterNames.add(DEFAULT_DICT_NAME);
@@ -376,12 +376,12 @@ public class SuggestComponent extends Se
/** Convert {@link SuggesterResult} to NamedList for constructing responses */
private void toNamedList(SuggesterResult suggesterResult, Map<String, SimpleOrderedMap<NamedList<Object>>> resultObj) {
for(String suggesterName : suggesterResult.getSuggesterNames()) {
- SimpleOrderedMap<NamedList<Object>> results = new SimpleOrderedMap<NamedList<Object>>();
+ SimpleOrderedMap<NamedList<Object>> results = new SimpleOrderedMap<>();
for (String token : suggesterResult.getTokens(suggesterName)) {
- SimpleOrderedMap<Object> suggestionBody = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> suggestionBody = new SimpleOrderedMap<>();
List<LookupResult> lookupResults = suggesterResult.getLookupResult(suggesterName, token);
suggestionBody.add(SuggesterResultLabels.SUGGESTION_NUM_FOUND, lookupResults.size());
- List<SimpleOrderedMap<Object>> suggestEntriesNamedList = new ArrayList<SimpleOrderedMap<Object>>();
+ List<SimpleOrderedMap<Object>> suggestEntriesNamedList = new ArrayList<>();
for (LookupResult lookupResult : lookupResults) {
String suggestionString = lookupResult.key.toString();
long weight = lookupResult.value;
@@ -389,7 +389,7 @@ public class SuggestComponent extends Se
lookupResult.payload.utf8ToString()
: "";
- SimpleOrderedMap<Object> suggestEntryNamedList = new SimpleOrderedMap<Object>();
+ SimpleOrderedMap<Object> suggestEntryNamedList = new SimpleOrderedMap<>();
suggestEntryNamedList.add(SuggesterResultLabels.SUGGESTION_TERM, suggestionString);
suggestEntryNamedList.add(SuggesterResultLabels.SUGGESTION_WEIGHT, weight);
suggestEntryNamedList.add(SuggesterResultLabels.SUGGESTION_PAYLOAD, payload);