You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/03/12 15:39:39 UTC
svn commit: r1576755 [18/27] - in /lucene/dev/trunk: lucene/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/
lucene/analysis/common/src/java/org/apache/lucene/a...
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java Wed Mar 12 14:39:17 2014
@@ -198,11 +198,11 @@ public class DocumentAnalysisRequestHand
NamedList<Object> handleAnalysisRequest(DocumentAnalysisRequest request, IndexSchema schema) {
SchemaField uniqueKeyField = schema.getUniqueKeyField();
- NamedList<Object> result = new SimpleOrderedMap<Object>();
+ NamedList<Object> result = new SimpleOrderedMap<>();
for (SolrInputDocument document : request.getDocuments()) {
- NamedList<NamedList> theTokens = new SimpleOrderedMap<NamedList>();
+ NamedList<NamedList> theTokens = new SimpleOrderedMap<>();
result.add(document.getFieldValue(uniqueKeyField.getName()).toString(), theTokens);
for (String name : document.getFieldNames()) {
@@ -212,7 +212,7 @@ public class DocumentAnalysisRequestHand
continue;
}
- NamedList<Object> fieldTokens = new SimpleOrderedMap<Object>();
+ NamedList<Object> fieldTokens = new SimpleOrderedMap<>();
theTokens.add(name, fieldTokens);
FieldType fieldType = schema.getFieldType(name);
@@ -241,7 +241,7 @@ public class DocumentAnalysisRequestHand
AnalysisContext analysisContext = new AnalysisContext(fieldType, analyzer, termsToMatch);
Collection<Object> fieldValues = document.getFieldValues(name);
NamedList<NamedList<? extends Object>> indexTokens
- = new SimpleOrderedMap<NamedList<? extends Object>>();
+ = new SimpleOrderedMap<>();
for (Object fieldValue : fieldValues) {
indexTokens.add(String.valueOf(fieldValue),
analyzeValue(fieldValue.toString(), analysisContext));
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java Wed Mar 12 14:39:17 2014
@@ -38,10 +38,10 @@ public class DumpRequestHandler extends
// Write the streams...
if( req.getContentStreams() != null ) {
- ArrayList<NamedList<Object>> streams = new ArrayList<NamedList<Object>>();
+ ArrayList<NamedList<Object>> streams = new ArrayList<>();
// Cycle through each stream
for( ContentStream content : req.getContentStreams() ) {
- NamedList<Object> stream = new SimpleOrderedMap<Object>();
+ NamedList<Object> stream = new SimpleOrderedMap<>();
stream.add( "name", content.getName() );
stream.add( "sourceInfo", content.getSourceInfo() );
stream.add( "size", content.getSize() );
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java Wed Mar 12 14:39:17 2014
@@ -173,9 +173,9 @@ public class FieldAnalysisRequestHandler
* @return The analysis breakdown as a named list.
*/
protected NamedList<NamedList> handleAnalysisRequest(FieldAnalysisRequest request, IndexSchema schema) {
- NamedList<NamedList> analysisResults = new SimpleOrderedMap<NamedList>();
+ NamedList<NamedList> analysisResults = new SimpleOrderedMap<>();
- NamedList<NamedList> fieldTypeAnalysisResults = new SimpleOrderedMap<NamedList>();
+ NamedList<NamedList> fieldTypeAnalysisResults = new SimpleOrderedMap<>();
if (request.getFieldTypes() != null) {
for (String fieldTypeName : request.getFieldTypes()) {
FieldType fieldType = schema.getFieldTypes().get(fieldTypeName);
@@ -183,7 +183,7 @@ public class FieldAnalysisRequestHandler
}
}
- NamedList<NamedList> fieldNameAnalysisResults = new SimpleOrderedMap<NamedList>();
+ NamedList<NamedList> fieldNameAnalysisResults = new SimpleOrderedMap<>();
if (request.getFieldNames() != null) {
for (String fieldName : request.getFieldNames()) {
FieldType fieldType = schema.getFieldType(fieldName);
@@ -215,7 +215,7 @@ public class FieldAnalysisRequestHandler
? getQueryTokenSet(queryValue, fieldType.getQueryAnalyzer())
: EMPTY_BYTES_SET;
- NamedList<NamedList> analyzeResults = new SimpleOrderedMap<NamedList>();
+ NamedList<NamedList> analyzeResults = new SimpleOrderedMap<>();
if (analysisRequest.getFieldValue() != null) {
AnalysisContext context = new AnalysisContext(fieldName, fieldType, fieldType.getAnalyzer(), termsToMatch);
NamedList analyzedTokens = analyzeValue(analysisRequest.getFieldValue(), context);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java Wed Mar 12 14:39:17 2014
@@ -98,7 +98,7 @@ public class MoreLikeThisHandler extends
String[] fqs = req.getParams().getParams(CommonParams.FQ);
if (fqs!=null && fqs.length!=0) {
- filters = new ArrayList<Query>();
+ filters = new ArrayList<>();
for (String fq : fqs) {
if (fq != null && fq.trim().length()!=0) {
QParser fqp = QParser.getParser(fq, null, req);
@@ -186,14 +186,14 @@ public class MoreLikeThisHandler extends
if( interesting != null ) {
if( termStyle == TermStyle.DETAILS ) {
- NamedList<Float> it = new NamedList<Float>();
+ NamedList<Float> it = new NamedList<>();
for( InterestingTerm t : interesting ) {
it.add( t.term.toString(), t.boost );
}
rsp.add( "interestingTerms", it );
}
else {
- List<String> it = new ArrayList<String>( interesting.size() );
+ List<String> it = new ArrayList<>( interesting.size() );
for( InterestingTerm t : interesting ) {
it.add( t.term.text());
}
@@ -236,7 +236,7 @@ public class MoreLikeThisHandler extends
if (null != dbgInfo) {
if (null != filters) {
dbgInfo.add("filter_queries",req.getParams().getParams(CommonParams.FQ));
- List<String> fqs = new ArrayList<String>(filters.size());
+ List<String> fqs = new ArrayList<>(filters.size());
for (Query fq : filters) {
fqs.add(QueryParsing.toString(fq, req.getSchema()));
}
@@ -388,7 +388,7 @@ public class MoreLikeThisHandler extends
public NamedList<DocList> getMoreLikeThese( DocList docs, int rows, int flags ) throws IOException
{
IndexSchema schema = searcher.getSchema();
- NamedList<DocList> mlt = new SimpleOrderedMap<DocList>();
+ NamedList<DocList> mlt = new SimpleOrderedMap<>();
DocIterator iterator = docs.iterator();
while( iterator.hasNext() ) {
int id = iterator.nextDoc();
@@ -404,7 +404,7 @@ public class MoreLikeThisHandler extends
public NamedList<BooleanQuery> getMoreLikeTheseQuery(DocList docs)
throws IOException {
IndexSchema schema = searcher.getSchema();
- NamedList<BooleanQuery> result = new NamedList<BooleanQuery>();
+ NamedList<BooleanQuery> result = new NamedList<>();
DocIterator iterator = docs.iterator();
while (iterator.hasNext()) {
int id = iterator.nextDoc();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java Wed Mar 12 14:39:17 2014
@@ -28,7 +28,7 @@ public class RealTimeGetHandler extends
@Override
protected List<String> getDefaultComponents()
{
- List<String> names = new ArrayList<String>(1);
+ List<String> names = new ArrayList<>(1);
names.add(RealTimeGetComponent.COMPONENT_NAME);
return names;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java Wed Mar 12 14:39:17 2014
@@ -140,7 +140,7 @@ public class ReplicationHandler extends
private String includeConfFiles;
- private NamedList<String> confFileNameAlias = new NamedList<String>();
+ private NamedList<String> confFileNameAlias = new NamedList<>();
private boolean isMaster = false;
@@ -156,7 +156,7 @@ public class ReplicationHandler extends
private int numTimesReplicated = 0;
- private final Map<String, FileInfo> confFileInfoCache = new HashMap<String, FileInfo>();
+ private final Map<String, FileInfo> confFileInfoCache = new HashMap<>();
private Integer reserveCommitDuration = SnapPuller.readInterval("00:00:10");
@@ -270,14 +270,14 @@ public class ReplicationHandler extends
private List<NamedList<Object>> getCommits() {
Map<Long, IndexCommit> commits = core.getDeletionPolicy().getCommits();
- List<NamedList<Object>> l = new ArrayList<NamedList<Object>>();
+ List<NamedList<Object>> l = new ArrayList<>();
for (IndexCommit c : commits.values()) {
try {
- NamedList<Object> nl = new NamedList<Object>();
+ NamedList<Object> nl = new NamedList<>();
nl.add("indexVersion", IndexDeletionPolicyWrapper.getCommitTimestamp(c));
nl.add(GENERATION, c.getGeneration());
- List<String> commitList = new ArrayList<String>(c.getFileNames().size());
+ List<String> commitList = new ArrayList<>(c.getFileNames().size());
commitList.addAll(c.getFileNames());
Collections.sort(commitList);
nl.add(CMD_GET_FILE_LIST, commitList);
@@ -404,19 +404,19 @@ public class ReplicationHandler extends
}
// reserve the indexcommit for sometime
core.getDeletionPolicy().setReserveDuration(gen, reserveCommitDuration);
- List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> result = new ArrayList<>();
Directory dir = null;
try {
// get all the files in the commit
// use a set to workaround possible Lucene bug which returns same file
// name multiple times
- Collection<String> files = new HashSet<String>(commit.getFileNames());
+ Collection<String> files = new HashSet<>(commit.getFileNames());
dir = core.getDirectoryFactory().get(core.getNewIndexDir(), DirContext.DEFAULT, core.getSolrConfig().indexConfig.lockType);
try {
for (String fileName : files) {
if (fileName.endsWith(".lock")) continue;
- Map<String,Object> fileMeta = new HashMap<String,Object>();
+ Map<String,Object> fileMeta = new HashMap<>();
fileMeta.put(NAME, fileName);
fileMeta.put(SIZE, dir.fileLength(fileName));
result.add(fileMeta);
@@ -446,7 +446,7 @@ public class ReplicationHandler extends
*/
List<Map<String, Object>> getConfFileInfoFromCache(NamedList<String> nameAndAlias,
final Map<String, FileInfo> confFileInfoCache) {
- List<Map<String, Object>> confFiles = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> confFiles = new ArrayList<>();
synchronized (confFileInfoCache) {
File confDir = new File(core.getResourceLoader().getConfigDir());
Checksum checksum = null;
@@ -482,7 +482,7 @@ public class ReplicationHandler extends
}
Map<String, Object> getAsMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put(NAME, name);
map.put(SIZE, size);
map.put(CHECKSUM, checksum);
@@ -608,9 +608,9 @@ public class ReplicationHandler extends
* Used for showing statistics and progress information.
*/
private NamedList<Object> getReplicationDetails(boolean showSlaveDetails) {
- NamedList<Object> details = new SimpleOrderedMap<Object>();
- NamedList<Object> master = new SimpleOrderedMap<Object>();
- NamedList<Object> slave = new SimpleOrderedMap<Object>();
+ NamedList<Object> details = new SimpleOrderedMap<>();
+ NamedList<Object> master = new SimpleOrderedMap<>();
+ NamedList<Object> slave = new SimpleOrderedMap<>();
details.add("indexSize", NumberUtils.readableSize(getIndexSize()));
details.add("indexPath", core.getIndexDir());
@@ -677,7 +677,7 @@ public class ReplicationHandler extends
if (isReplicating) {
try {
long bytesToDownload = 0;
- List<String> filesToDownload = new ArrayList<String>();
+ List<String> filesToDownload = new ArrayList<>();
for (Map<String, Object> file : snapPuller.getFilesToDownload()) {
filesToDownload.add((String) file.get(NAME));
bytesToDownload += (Long) file.get(SIZE);
@@ -694,7 +694,7 @@ public class ReplicationHandler extends
slave.add("bytesToDownload", NumberUtils.readableSize(bytesToDownload));
long bytesDownloaded = 0;
- List<String> filesDownloaded = new ArrayList<String>();
+ List<String> filesDownloaded = new ArrayList<>();
for (Map<String, Object> file : snapPuller.getFilesDownloaded()) {
filesDownloaded.add((String) file.get(NAME));
bytesDownloaded += (Long) file.get(SIZE);
@@ -776,7 +776,7 @@ public class ReplicationHandler extends
} catch (NumberFormatException e) {/*no op*/ }
} else if (clzz == List.class) {
String ss[] = s.split(",");
- List<String> l = new ArrayList<String>();
+ List<String> l = new ArrayList<>();
for (int i = 0; i < ss.length; i++) {
l.add(new Date(Long.valueOf(ss[i])).toString());
}
@@ -788,7 +788,7 @@ public class ReplicationHandler extends
}
private List<String> getReplicateAfterStrings() {
- List<String> replicateAfter = new ArrayList<String>();
+ List<String> replicateAfter = new ArrayList<>();
if (replicateOnCommit)
replicateAfter.add("commit");
if (replicateOnOptimize)
@@ -873,7 +873,7 @@ public class ReplicationHandler extends
if (!enableSlave && !enableMaster) {
enableMaster = true;
- master = new NamedList<Object>();
+ master = new NamedList<>();
}
if (enableMaster) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java Wed Mar 12 14:39:17 2014
@@ -196,7 +196,7 @@ public abstract class RequestHandlerBase
@Override
public NamedList<Object> getStatistics() {
- NamedList<Object> lst = new SimpleOrderedMap<Object>();
+ NamedList<Object> lst = new SimpleOrderedMap<>();
Snapshot snapshot = requestTimes.getSnapshot();
lst.add("handlerStart",handlerStart);
lst.add("requests", numRequests.longValue());
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java Wed Mar 12 14:39:17 2014
@@ -75,7 +75,7 @@ public class RequestHandlerUtils
}
- private static Set<String> commitParams = new HashSet<String>(Arrays.asList(new String[]{UpdateParams.OPEN_SEARCHER, UpdateParams.WAIT_SEARCHER, UpdateParams.SOFT_COMMIT, UpdateParams.EXPUNGE_DELETES, UpdateParams.MAX_OPTIMIZE_SEGMENTS, UpdateParams.PREPARE_COMMIT}));
+ private static Set<String> commitParams = new HashSet<>(Arrays.asList(new String[]{UpdateParams.OPEN_SEARCHER, UpdateParams.WAIT_SEARCHER, UpdateParams.SOFT_COMMIT, UpdateParams.EXPUNGE_DELETES, UpdateParams.MAX_OPTIMIZE_SEGMENTS, UpdateParams.PREPARE_COMMIT}));
public static void validateCommitParams(SolrParams params) {
Iterator<String> i = params.getParameterNamesIterator();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java Wed Mar 12 14:39:17 2014
@@ -558,7 +558,7 @@ public class SnapPuller {
* @throws IOException on IO error
*/
private void logReplicationTimeAndConfFiles(Collection<Map<String, Object>> modifiedConfFiles, boolean successfulInstall) throws IOException {
- List<String> confFiles = new ArrayList<String>();
+ List<String> confFiles = new ArrayList<>();
if (modifiedConfFiles != null && !modifiedConfFiles.isEmpty())
for (Map<String, Object> map1 : modifiedConfFiles)
confFiles.add((String) map1.get(NAME));
@@ -641,7 +641,7 @@ public class SnapPuller {
private StringBuilder readToStringBuilder(long replicationTime, String str) {
StringBuilder sb = new StringBuilder();
- List<String> l = new ArrayList<String>();
+ List<String> l = new ArrayList<>();
if (str != null && str.length() != 0) {
String[] ss = str.split(",");
for (int i = 0; i < ss.length; i++) {
@@ -737,7 +737,7 @@ public class SnapPuller {
localFileFetcher = new LocalFsFileFetcher(tmpconfDir, file, saveAs, true, latestGeneration);
currentFile = file;
localFileFetcher.fetchFile();
- confFilesDownloaded.add(new HashMap<String, Object>(file));
+ confFilesDownloaded.add(new HashMap<>(file));
}
// this is called before copying the files to the original conf dir
// so that if there is an exception avoid corrupting the original files.
@@ -769,7 +769,7 @@ public class SnapPuller {
(String) file.get(NAME), false, latestGeneration);
currentFile = file;
dirFileFetcher.fetchFile();
- filesDownloaded.add(new HashMap<String,Object>(file));
+ filesDownloaded.add(new HashMap<>(file));
} else {
LOG.info("Skipping download for " + file.get(NAME)
+ " because it already exists");
@@ -836,7 +836,7 @@ public class SnapPuller {
}
}
String segmentsFile = null;
- List<String> movedfiles = new ArrayList<String>();
+ List<String> movedfiles = new ArrayList<>();
for (Map<String, Object> f : filesDownloaded) {
String fname = (String) f.get(NAME);
// the segments file must be copied last
@@ -973,7 +973,7 @@ public class SnapPuller {
}
- private final Map<String, FileInfo> confFileInfoCache = new HashMap<String, FileInfo>();
+ private final Map<String, FileInfo> confFileInfoCache = new HashMap<>();
/**
* The local conf files are compared with the conf files in the master. If they are same (by checksum) do not copy.
@@ -986,7 +986,7 @@ public class SnapPuller {
if (confFilesToDownload == null || confFilesToDownload.isEmpty())
return Collections.EMPTY_LIST;
//build a map with alias/name as the key
- Map<String, Map<String, Object>> nameVsFile = new HashMap<String, Map<String, Object>>();
+ Map<String, Map<String, Object>> nameVsFile = new HashMap<>();
NamedList names = new NamedList();
for (Map<String, Object> map : confFilesToDownload) {
//if alias is present that is the name the file may have in the slave
@@ -1063,25 +1063,25 @@ public class SnapPuller {
//make a copy first because it can be null later
List<Map<String, Object>> tmp = confFilesToDownload;
//create a new instance. or else iterator may fail
- return tmp == null ? Collections.EMPTY_LIST : new ArrayList<Map<String, Object>>(tmp);
+ return tmp == null ? Collections.EMPTY_LIST : new ArrayList<>(tmp);
}
List<Map<String, Object>> getConfFilesDownloaded() {
//make a copy first because it can be null later
List<Map<String, Object>> tmp = confFilesDownloaded;
// NOTE: it's safe to make a copy of a SynchronizedCollection(ArrayList)
- return tmp == null ? Collections.EMPTY_LIST : new ArrayList<Map<String, Object>>(tmp);
+ return tmp == null ? Collections.EMPTY_LIST : new ArrayList<>(tmp);
}
List<Map<String, Object>> getFilesToDownload() {
//make a copy first because it can be null later
List<Map<String, Object>> tmp = filesToDownload;
- return tmp == null ? Collections.EMPTY_LIST : new ArrayList<Map<String, Object>>(tmp);
+ return tmp == null ? Collections.EMPTY_LIST : new ArrayList<>(tmp);
}
List<Map<String, Object>> getFilesDownloaded() {
List<Map<String, Object>> tmp = filesDownloaded;
- return tmp == null ? Collections.EMPTY_LIST : new ArrayList<Map<String, Object>>(tmp);
+ return tmp == null ? Collections.EMPTY_LIST : new ArrayList<>(tmp);
}
// TODO: currently does not reflect conf files
@@ -1090,7 +1090,7 @@ public class SnapPuller {
DirectoryFileFetcher tmpFileFetcher = dirFileFetcher;
if (tmp == null)
return null;
- tmp = new HashMap<String, Object>(tmp);
+ tmp = new HashMap<>(tmp);
if (tmpFileFetcher != null)
tmp.put("bytesDownloaded", tmpFileFetcher.bytesDownloaded);
return tmp;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java Wed Mar 12 14:39:17 2014
@@ -82,7 +82,7 @@ public class SnapShooter {
void createSnapshot(final IndexCommit indexCommit, int numberToKeep, ReplicationHandler replicationHandler) {
LOG.info("Creating backup snapshot...");
- NamedList<Object> details = new NamedList<Object>();
+ NamedList<Object> details = new NamedList<>();
details.add("startTime", new Date().toString());
File snapShotDir = null;
String directoryName = null;
@@ -131,7 +131,7 @@ public class SnapShooter {
}
private void deleteOldBackups(int numberToKeep) {
File[] files = new File(snapDir).listFiles();
- List<OldBackupDirectory> dirs = new ArrayList<OldBackupDirectory>();
+ List<OldBackupDirectory> dirs = new ArrayList<>();
for(File f : files) {
OldBackupDirectory obd = new OldBackupDirectory(f);
if(obd.dir != null) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java Wed Mar 12 14:39:17 2014
@@ -98,7 +98,7 @@ public class UpdateRequestHandler extend
String wt = loader.getDefaultWT();
// Make sure it is a valid writer
if(req.getCore().getQueryResponseWriter(wt)!=null) {
- Map<String,String> map = new HashMap<String,String>(1);
+ Map<String,String> map = new HashMap<>(1);
map.put(CommonParams.WT, wt);
req.setParams(SolrParams.wrapDefaults(params,
new MapSolrParams(map)));
@@ -117,7 +117,7 @@ public class UpdateRequestHandler extend
protected void setAssumeContentType(String ct) {
if(invariants==null) {
- Map<String,String> map = new HashMap<String,String>();
+ Map<String,String> map = new HashMap<>();
map.put(UpdateParams.ASSUME_CONTENT_TYPE,ct);
invariants = new MapSolrParams(map);
}
@@ -133,7 +133,7 @@ public class UpdateRequestHandler extend
if(args!=null) {
p = SolrParams.toSolrParams(args);
}
- Map<String,ContentStreamLoader> registry = new HashMap<String,ContentStreamLoader>();
+ Map<String,ContentStreamLoader> registry = new HashMap<>();
registry.put("application/xml", new XMLLoader().init(p) );
registry.put("application/json", new JsonLoader().init(p) );
registry.put("application/csv", new CSVLoader().init(p) );
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java Wed Mar 12 14:39:17 2014
@@ -401,7 +401,7 @@ public class CollectionsHandler extends
}
private static void copyIfNotNull(SolrParams params, Map<String, Object> props, String... keys) {
- ArrayList<String> prefixes = new ArrayList<String>(1);
+ ArrayList<String> prefixes = new ArrayList<>(1);
if(keys !=null){
for (String key : keys) {
if(key.endsWith(".")) {
@@ -444,7 +444,7 @@ public class CollectionsHandler extends
String name = req.getParams().required().get(ZkStateReader.COLLECTION_PROP);
String shard = req.getParams().required().get(ZkStateReader.SHARD_ID_PROP);
- Map<String,Object> props = new HashMap<String,Object>();
+ Map<String,Object> props = new HashMap<>();
props.put(ZkStateReader.COLLECTION_PROP, name);
props.put(Overseer.QUEUE_OPERATION, OverseerCollectionProcessor.DELETESHARD);
props.put(ZkStateReader.SHARD_ID_PROP, shard);
@@ -473,7 +473,7 @@ public class CollectionsHandler extends
"Only one of 'ranges' or 'split.key' should be specified");
}
- Map<String,Object> props = new HashMap<String,Object>();
+ Map<String,Object> props = new HashMap<>();
props.put(Overseer.QUEUE_OPERATION, OverseerCollectionProcessor.SPLITSHARD);
props.put("collection", name);
if (shard != null) {
@@ -495,7 +495,7 @@ public class CollectionsHandler extends
private void handleMigrate(SolrQueryRequest req, SolrQueryResponse rsp) throws KeeperException, InterruptedException {
log.info("Migrate action invoked: " + req.getParamString());
req.getParams().required().check("collection", "split.key", "target.collection");
- Map<String,Object> props = new HashMap<String,Object>();
+ Map<String,Object> props = new HashMap<>();
props.put(Overseer.QUEUE_OPERATION, OverseerCollectionProcessor.MIGRATE);
copyIfNotNull(req.getParams(), props, "collection", "split.key", "target.collection", "forward.timeout");
ZkNodeProps m = new ZkNodeProps(props);
@@ -504,7 +504,7 @@ public class CollectionsHandler extends
private void handleAddReplica(SolrQueryRequest req, SolrQueryResponse rsp) throws KeeperException, InterruptedException {
log.info("Add replica action invoked: " + req.getParamString());
- Map<String,Object> props = new HashMap<String,Object>();
+ Map<String,Object> props = new HashMap<>();
props.put(Overseer.QUEUE_OPERATION, CollectionAction.ADDREPLICA.toString());
copyIfNotNull(req.getParams(), props, COLLECTION_PROP, "node", SHARD_ID_PROP, ShardParams._ROUTE_,
CoreAdminParams.NAME, CoreAdminParams.INSTANCE_DIR, CoreAdminParams.DATA_DIR);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Wed Mar 12 14:39:17 2014
@@ -255,7 +255,7 @@ public class CoreAdminHandler extends Re
if (rangesArr.length == 0) {
throw new SolrException(ErrorCode.BAD_REQUEST, "There must be at least one range specified to split an index");
} else {
- ranges = new ArrayList<DocRouter.Range>(rangesArr.length);
+ ranges = new ArrayList<>(rangesArr.length);
for (String r : rangesArr) {
try {
ranges.add(DocRouter.DEFAULT.fromString(r));
@@ -304,7 +304,7 @@ public class CoreAdminHandler extends Re
}
if (pathsArr == null) {
- newCores = new ArrayList<SolrCore>(partitions);
+ newCores = new ArrayList<>(partitions);
for (String newCoreName : newCoreNames) {
SolrCore newcore = coreContainer.getCore(newCoreName);
if (newcore != null) {
@@ -705,7 +705,7 @@ public class CoreAdminHandler extends Re
String indexInfo = params.get(CoreAdminParams.INDEX_INFO);
boolean isIndexInfoNeeded = Boolean.parseBoolean(null == indexInfo ? "true" : indexInfo);
boolean doPersist = false;
- NamedList<Object> status = new SimpleOrderedMap<Object>();
+ NamedList<Object> status = new SimpleOrderedMap<>();
Map<String,Exception> allFailures = coreContainer.getCoreInitFailures();
try {
if (cname == null) {
@@ -832,7 +832,7 @@ public class CoreAdminHandler extends Re
if (core != null) {
syncStrategy = new SyncStrategy(core.getCoreDescriptor().getCoreContainer());
- Map<String,Object> props = new HashMap<String,Object>();
+ Map<String,Object> props = new HashMap<>();
props.put(ZkStateReader.BASE_URL_PROP, zkController.getBaseUrl());
props.put(ZkStateReader.CORE_NAME_PROP, cname);
props.put(ZkStateReader.NODE_NAME_PROP, zkController.getNodeName());
@@ -1077,7 +1077,7 @@ public class CoreAdminHandler extends Re
* @throws IOException - LukeRequestHandler can throw an I/O exception
*/
protected NamedList<Object> getCoreStatus(CoreContainer cores, String cname, boolean isIndexInfoNeeded) throws IOException {
- NamedList<Object> info = new SimpleOrderedMap<Object>();
+ NamedList<Object> info = new SimpleOrderedMap<>();
if (!cores.isLoaded(cname)) { // Lazily-loaded core, fill in what we can.
// It would be a real mistake to load the cores just to get the status
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java Wed Mar 12 14:39:17 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/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java Wed Mar 12 14:39:17 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/trunk/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java Wed Mar 12 14:39:17 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/trunk/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java Wed Mar 12 14:39:17 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/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java Wed Mar 12 14:39:17 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/trunk/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java Wed Mar 12 14:39:17 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/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Wed Mar 12 14:39:17 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/trunk/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java Wed Mar 12 14:39:17 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/trunk/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java Wed Mar 12 14:39:17 2014
@@ -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/trunk/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java Wed Mar 12 14:39:17 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/trunk/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java Wed Mar 12 14:39:17 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/trunk/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java Wed Mar 12 14:39:17 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/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java Wed Mar 12 14:39:17 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/trunk/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java Wed Mar 12 14:39:17 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/trunk/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java Wed Mar 12 14:39:17 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/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java Wed Mar 12 14:39:17 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());