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 [4/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/an...
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java Wed Mar 12 14:39:17 2014
@@ -42,7 +42,7 @@ public class CommitIndexTask extends Per
@Override
public void setParams(String params) {
super.setParams(params);
- commitUserData = new HashMap<String,String>();
+ commitUserData = new HashMap<>();
commitUserData.put(OpenReaderTask.USER_DATA, params);
}
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java Wed Mar 12 14:39:17 2014
@@ -25,7 +25,7 @@ import org.apache.lucene.benchmark.byTas
public class ConsumeContentSourceTask extends PerfTask {
private final ContentSource source;
- private ThreadLocal<DocData> dd = new ThreadLocal<DocData>();
+ private ThreadLocal<DocData> dd = new ThreadLocal<>();
public ConsumeContentSourceTask(PerfRunData runData) {
super(runData);
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java Wed Mar 12 14:39:17 2014
@@ -39,7 +39,7 @@ public class NewAnalyzerTask extends Per
public NewAnalyzerTask(PerfRunData runData) {
super(runData);
- analyzerNames = new ArrayList<String>();
+ analyzerNames = new ArrayList<>();
}
public static final Analyzer createAnalyzer(String className) throws Exception{
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java Wed Mar 12 14:39:17 2014
@@ -300,7 +300,7 @@ public abstract class ReadTask extends P
*/
protected Collection<String> getFieldsToHighlight(StoredDocument document) {
List<StorableField> fields = document.getFields();
- Set<String> result = new HashSet<String>(fields.size());
+ Set<String> result = new HashSet<>(fields.size());
for (final StorableField f : fields) {
result.add(f.name());
}
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java Wed Mar 12 14:39:17 2014
@@ -53,7 +53,7 @@ public class RepSumByNameRoundTask exten
*/
protected Report reportSumByNameRound(List<TaskStats> taskStats) {
// aggregate by task name and round
- LinkedHashMap<String,TaskStats> p2 = new LinkedHashMap<String,TaskStats>();
+ LinkedHashMap<String,TaskStats> p2 = new LinkedHashMap<>();
int reported = 0;
for (final TaskStats stat1 : taskStats) {
if (stat1.getElapsed()>=0) { // consider only tasks that ended
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java Wed Mar 12 14:39:17 2014
@@ -54,7 +54,7 @@ public class RepSumByNameTask extends Re
protected Report reportSumByName(List<TaskStats> taskStats) {
// aggregate by task name
int reported = 0;
- LinkedHashMap<String,TaskStats> p2 = new LinkedHashMap<String,TaskStats>();
+ LinkedHashMap<String,TaskStats> p2 = new LinkedHashMap<>();
for (final TaskStats stat1: taskStats) {
if (stat1.getElapsed()>=0) { // consider only tasks that ended
reported++;
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java Wed Mar 12 14:39:17 2014
@@ -50,7 +50,7 @@ public class RepSumByPrefRoundTask exten
protected Report reportSumByPrefixRound(List<TaskStats> taskStats) {
// aggregate by task name and by round
int reported = 0;
- LinkedHashMap<String,TaskStats> p2 = new LinkedHashMap<String,TaskStats>();
+ LinkedHashMap<String,TaskStats> p2 = new LinkedHashMap<>();
for (final TaskStats stat1 : taskStats) {
if (stat1.getElapsed()>=0 && stat1.getTask().getName().startsWith(prefix)) { // only ended tasks with proper name
reported++;
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java Wed Mar 12 14:39:17 2014
@@ -52,7 +52,7 @@ public class RepSumByPrefTask extends Re
protected Report reportSumByPrefix (List<TaskStats> taskStats) {
// aggregate by task name
int reported = 0;
- LinkedHashMap<String,TaskStats> p2 = new LinkedHashMap<String,TaskStats>();
+ LinkedHashMap<String,TaskStats> p2 = new LinkedHashMap<>();
for (final TaskStats stat1 : taskStats) {
if (stat1.getElapsed()>=0 && stat1.getTask().getName().startsWith(prefix)) { // only ended tasks with proper name
reported++;
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java Wed Mar 12 14:39:17 2014
@@ -138,7 +138,7 @@ public class SearchTravRetHighlightTask
} else if (splits[i].startsWith("mergeContiguous[") == true){
mergeContiguous = Boolean.valueOf(splits[i].substring("mergeContiguous[".length(),splits[i].length() - 1)).booleanValue();
} else if (splits[i].startsWith("fields[") == true){
- paramFields = new HashSet<String>();
+ paramFields = new HashSet<>();
String fieldNames = splits[i].substring("fields[".length(), splits[i].length() - 1);
String [] fieldSplits = fieldNames.split(";");
for (int j = 0; j < fieldSplits.length; j++) {
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java Wed Mar 12 14:39:17 2014
@@ -68,7 +68,7 @@ public class SearchTravRetLoadFieldSelec
@Override
public void setParams(String params) {
this.params = params; // cannot just call super.setParams(), b/c it's params differ.
- fieldsToLoad = new HashSet<String>();
+ fieldsToLoad = new HashSet<>();
for (StringTokenizer tokenizer = new StringTokenizer(params, ","); tokenizer.hasMoreTokens();) {
String s = tokenizer.nextToken();
fieldsToLoad.add(s);
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java Wed Mar 12 14:39:17 2014
@@ -135,7 +135,7 @@ public class SearchTravRetVectorHighligh
} else if (splits[i].startsWith("fragSize[") == true){
fragSize = (int)Float.parseFloat(splits[i].substring("fragSize[".length(),splits[i].length() - 1));
} else if (splits[i].startsWith("fields[") == true){
- paramFields = new HashSet<String>();
+ paramFields = new HashSet<>();
String fieldNames = splits[i].substring("fields[".length(), splits[i].length() - 1);
String [] fieldSplits = fieldNames.split(";");
for (int j = 0; j < fieldSplits.length; j++) {
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java Wed Mar 12 14:39:17 2014
@@ -58,7 +58,7 @@ public class TaskSequence extends PerfTa
setSequenceName();
this.parent = parent;
this.parallel = parallel;
- tasks = new ArrayList<PerfTask>();
+ tasks = new ArrayList<>();
logByTimeMsec = runData.getConfig().get("report.time.step.msec", 0);
}
@@ -186,7 +186,7 @@ public class TaskSequence extends PerfTa
final PerfTask task = tasksArray[l];
if (task.getRunInBackground()) {
if (bgTasks == null) {
- bgTasks = new ArrayList<RunBackgroundTask>();
+ bgTasks = new ArrayList<>();
}
RunBackgroundTask bgTask = new RunBackgroundTask(task, letChildReport);
bgTask.setPriority(task.getBackgroundDeltaPriority() + Thread.currentThread().getPriority());
@@ -518,7 +518,7 @@ public class TaskSequence extends PerfTa
@Override
protected TaskSequence clone() throws CloneNotSupportedException {
TaskSequence res = (TaskSequence) super.clone();
- res.tasks = new ArrayList<PerfTask>();
+ res.tasks = new ArrayList<>();
for (int i = 0; i < tasks.size(); i++) {
res.tasks.add(tasks.get(i).clone());
}
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java Wed Mar 12 14:39:17 2014
@@ -86,8 +86,8 @@ public class WriteLineDocTask extends Pe
protected final String fname;
private final PrintWriter lineFileOut;
private final DocMaker docMaker;
- private final ThreadLocal<StringBuilder> threadBuffer = new ThreadLocal<StringBuilder>();
- private final ThreadLocal<Matcher> threadNormalizer = new ThreadLocal<Matcher>();
+ private final ThreadLocal<StringBuilder> threadBuffer = new ThreadLocal<>();
+ private final ThreadLocal<Matcher> threadNormalizer = new ThreadLocal<>();
private final String[] fieldsToWrite;
private final boolean[] sufficientFields;
private final boolean checkSufficientFields;
@@ -122,7 +122,7 @@ public class WriteLineDocTask extends Pe
checkSufficientFields = false;
} else {
checkSufficientFields = true;
- HashSet<String> sf = new HashSet<String>(Arrays.asList(suff.split(",")));
+ HashSet<String> sf = new HashSet<>(Arrays.asList(suff.split(",")));
for (int i=0; i<fieldsToWrite.length; i++) {
if (sf.contains(fieldsToWrite[i])) {
sufficientFields[i] = true;
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java Wed Mar 12 14:39:17 2014
@@ -293,7 +293,7 @@ public class Algorithm {
if (alts==null) {
return new String[]{ dfltPkg };
}
- ArrayList<String> pkgs = new ArrayList<String>();
+ ArrayList<String> pkgs = new ArrayList<>();
pkgs.add(dfltPkg);
for (String alt : alts.split(",")) {
pkgs.add(alt);
@@ -339,7 +339,7 @@ public class Algorithm {
* @return all tasks participating in this algorithm.
*/
public ArrayList<PerfTask> extractTasks() {
- ArrayList<PerfTask> res = new ArrayList<PerfTask>();
+ ArrayList<PerfTask> res = new ArrayList<>();
extractTasks(res, sequence);
return res;
}
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java Wed Mar 12 14:39:17 2014
@@ -50,8 +50,8 @@ public class Config {
private int roundNumber = 0;
private Properties props;
- private HashMap<String, Object> valByRound = new HashMap<String, Object>();
- private HashMap<String, String> colForValByRound = new HashMap<String, String>();
+ private HashMap<String, Object> valByRound = new HashMap<>();
+ private HashMap<String, String> colForValByRound = new HashMap<>();
private String algorithmText;
/**
@@ -62,7 +62,7 @@ public class Config {
*/
public Config(Reader algReader) throws IOException {
// read alg file to array of lines
- ArrayList<String> lines = new ArrayList<String>();
+ ArrayList<String> lines = new ArrayList<>();
BufferedReader r = new BufferedReader(algReader);
int lastConfigLine = 0;
for (String line = r.readLine(); line != null; line = r.readLine()) {
@@ -314,7 +314,7 @@ public class Config {
return new String[]{s};
}
- ArrayList<String> a = new ArrayList<String>();
+ ArrayList<String> a = new ArrayList<>();
StringTokenizer st = new StringTokenizer(s, ":");
while (st.hasMoreTokens()) {
String t = st.nextToken();
@@ -329,7 +329,7 @@ public class Config {
return new int[]{Integer.parseInt(s)};
}
- ArrayList<Integer> a = new ArrayList<Integer>();
+ ArrayList<Integer> a = new ArrayList<>();
StringTokenizer st = new StringTokenizer(s, ":");
while (st.hasMoreTokens()) {
String t = st.nextToken();
@@ -348,7 +348,7 @@ public class Config {
return new double[]{Double.parseDouble(s)};
}
- ArrayList<Double> a = new ArrayList<Double>();
+ ArrayList<Double> a = new ArrayList<>();
StringTokenizer st = new StringTokenizer(s, ":");
while (st.hasMoreTokens()) {
String t = st.nextToken();
@@ -367,7 +367,7 @@ public class Config {
return new boolean[]{Boolean.valueOf(s).booleanValue()};
}
- ArrayList<Boolean> a = new ArrayList<Boolean>();
+ ArrayList<Boolean> a = new ArrayList<>();
StringTokenizer st = new StringTokenizer(s, ":");
while (st.hasMoreTokens()) {
String t = st.nextToken();
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java Wed Mar 12 14:39:17 2014
@@ -71,7 +71,7 @@ public class StreamUtils {
}
}
- private static final Map<String,Type> extensionToType = new HashMap<String,Type>();
+ private static final Map<String,Type> extensionToType = new HashMap<>();
static {
// these in are lower case, we will lower case at the test as well
extensionToType.put(".bz2", Type.BZIP2);
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java Wed Mar 12 14:39:17 2014
@@ -68,7 +68,7 @@ public class QualityStats {
public QualityStats(double maxGoodPoints, long searchTime) {
this.maxGoodPoints = maxGoodPoints;
this.searchTime = searchTime;
- this.recallPoints = new ArrayList<RecallPoint>();
+ this.recallPoints = new ArrayList<>();
pAt = new double[MAX_POINTS+1]; // pAt[0] unused.
}
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java Wed Mar 12 14:39:17 2014
@@ -74,7 +74,7 @@ public class QueryDriver {
// validate topics & judgments match each other
judge.validateData(qqs, logger);
- Set<String> fieldSet = new HashSet<String>();
+ Set<String> fieldSet = new HashSet<>();
if (fieldSpec.indexOf('T') >= 0) fieldSet.add("title");
if (fieldSpec.indexOf('D') >= 0) fieldSet.add("description");
if (fieldSpec.indexOf('N') >= 0) fieldSet.add("narrative");
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/Trec1MQReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/Trec1MQReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/Trec1MQReader.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/Trec1MQReader.java Wed Mar 12 14:39:17 2014
@@ -55,7 +55,7 @@ public class Trec1MQReader {
* @throws IOException if cannot read the queries.
*/
public QualityQuery[] readQueries(BufferedReader reader) throws IOException {
- ArrayList<QualityQuery> res = new ArrayList<QualityQuery>();
+ ArrayList<QualityQuery> res = new ArrayList<>();
String line;
try {
while (null!=(line=reader.readLine())) {
@@ -69,7 +69,7 @@ public class Trec1MQReader {
// qtext
String qtext = line.substring(k+1).trim();
// we got a topic!
- HashMap<String,String> fields = new HashMap<String,String>();
+ HashMap<String,String> fields = new HashMap<>();
fields.put(name,qtext);
//System.out.println("id: "+id+" qtext: "+qtext+" line: "+line);
QualityQuery topic = new QualityQuery(id,fields);
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecJudge.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecJudge.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecJudge.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecJudge.java Wed Mar 12 14:39:17 2014
@@ -49,7 +49,7 @@ public class TrecJudge implements Judge
* @throws IOException If there is a low-level I/O error.
*/
public TrecJudge (BufferedReader reader) throws IOException {
- judgements = new HashMap<String,QRelJudgement>();
+ judgements = new HashMap<>();
QRelJudgement curr = null;
String zero = "0";
String line;
@@ -96,7 +96,7 @@ public class TrecJudge implements Judge
QRelJudgement(String queryID) {
this.queryID = queryID;
- relevantDocs = new HashMap<String,String>();
+ relevantDocs = new HashMap<>();
}
public void addRelevandDoc(String docName) {
@@ -115,8 +115,8 @@ public class TrecJudge implements Judge
// inherit javadocs
@Override
public boolean validateData(QualityQuery[] qq, PrintWriter logger) {
- HashMap<String,QRelJudgement> missingQueries = new HashMap<String, QRelJudgement>(judgements);
- ArrayList<String> missingJudgements = new ArrayList<String>();
+ HashMap<String,QRelJudgement> missingQueries = new HashMap<>(judgements);
+ ArrayList<String> missingJudgements = new ArrayList<>();
for (int i=0; i<qq.length; i++) {
String id = qq[i].getQueryID();
if (missingQueries.containsKey(id)) {
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java Wed Mar 12 14:39:17 2014
@@ -62,11 +62,11 @@ public class TrecTopicsReader {
* @throws IOException if cannot read the queries.
*/
public QualityQuery[] readQueries(BufferedReader reader) throws IOException {
- ArrayList<QualityQuery> res = new ArrayList<QualityQuery>();
+ ArrayList<QualityQuery> res = new ArrayList<>();
StringBuilder sb;
try {
while (null!=(sb=read(reader,"<top>",null,false,false))) {
- HashMap<String,String> fields = new HashMap<String,String>();
+ HashMap<String,String> fields = new HashMap<>();
// id
sb = read(reader,"<num>",null,true,false);
int k = sb.indexOf(":");
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java Wed Mar 12 14:39:17 2014
@@ -47,7 +47,7 @@ public class DocNameExtractor {
* @throws IOException if cannot extract the doc name from the index.
*/
public String docName(IndexSearcher searcher, int docid) throws IOException {
- final List<String> name = new ArrayList<String>();
+ final List<String> name = new ArrayList<>();
searcher.getIndexReader().document(docid, new StoredFieldVisitor() {
@Override
public void stringField(FieldInfo fieldInfo, String value) {
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java Wed Mar 12 14:39:17 2014
@@ -35,7 +35,7 @@ public class SimpleQQParser implements Q
private String qqNames[];
private String indexField;
- ThreadLocal<QueryParser> queryParser = new ThreadLocal<QueryParser>();
+ ThreadLocal<QueryParser> queryParser = new ThreadLocal<>();
/**
* Constructor of a simple qq parser.
Modified: lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java Wed Mar 12 14:39:17 2014
@@ -360,7 +360,7 @@ public class TrecContentSourceTest exten
DocData dd = new DocData();
int n = 0;
boolean gotExpectedException = false;
- HashSet<ParsePathType> unseenTypes = new HashSet<ParsePathType>(Arrays.asList(ParsePathType.values()));
+ HashSet<ParsePathType> unseenTypes = new HashSet<>(Arrays.asList(ParsePathType.values()));
try {
while (n<100) { // arbiterary limit to prevent looping forever in case of test failure
dd = tcs.getNextDocData(dd);
Modified: lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java Wed Mar 12 14:39:17 2014
@@ -344,7 +344,7 @@ public class WriteLineDocTaskTest extend
wldt.close();
- Set<String> ids = new HashSet<String>();
+ Set<String> ids = new HashSet<>();
BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file), "utf-8"));
try {
String line = br.readLine();
Modified: lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java (original)
+++ lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java Wed Mar 12 14:39:17 2014
@@ -97,7 +97,7 @@ public class KNearestNeighborClassifier
private ClassificationResult<BytesRef> selectClassFromNeighbors(TopDocs topDocs) throws IOException {
// TODO : improve the nearest neighbor selection
- Map<BytesRef, Integer> classCounts = new HashMap<BytesRef, Integer>();
+ Map<BytesRef, Integer> classCounts = new HashMap<>();
for (ScoreDoc scoreDoc : topDocs.scoreDocs) {
BytesRef cl = new BytesRef(indexSearcher.doc(scoreDoc.doc).getField(classFieldName).stringValue());
Integer count = classCounts.get(cl);
@@ -117,7 +117,7 @@ public class KNearestNeighborClassifier
}
}
double score = max / (double) k;
- return new ClassificationResult<BytesRef>(assignedClass, score);
+ return new ClassificationResult<>(assignedClass, score);
}
/**
Modified: lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java (original)
+++ lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java Wed Mar 12 14:39:17 2014
@@ -109,7 +109,7 @@ public class SimpleNaiveBayesClassifier
}
private String[] tokenizeDoc(String doc) throws IOException {
- Collection<String> result = new LinkedList<String>();
+ Collection<String> result = new LinkedList<>();
for (String textFieldName : textFieldNames) {
try (TokenStream tokenStream = analyzer.tokenStream(textFieldName, doc)) {
CharTermAttribute charTermAttribute = tokenStream.addAttribute(CharTermAttribute.class);
@@ -146,7 +146,7 @@ public class SimpleNaiveBayesClassifier
}
}
double score = 10 / Math.abs(max);
- return new ClassificationResult<BytesRef>(foundClass, score);
+ return new ClassificationResult<>(foundClass, score);
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java Wed Mar 12 14:39:17 2014
@@ -66,7 +66,7 @@ public class BlockTermsReader extends Fi
// produce DocsEnum on demand
private final PostingsReaderBase postingsReader;
- private final TreeMap<String,FieldReader> fields = new TreeMap<String,FieldReader>();
+ private final TreeMap<String,FieldReader> fields = new TreeMap<>();
// Reads the terms index
private TermsIndexReaderBase indexReader;
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java Wed Mar 12 14:39:17 2014
@@ -96,7 +96,7 @@ public class BlockTermsWriter extends Fi
}
}
- private final List<FieldMetaData> fields = new ArrayList<FieldMetaData>();
+ private final List<FieldMetaData> fields = new ArrayList<>();
// private final String segment;
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java Wed Mar 12 14:39:17 2014
@@ -61,7 +61,7 @@ public class FixedGapTermsIndexReader ex
private final PagedBytes termBytes = new PagedBytes(PAGED_BYTES_BITS);
private PagedBytes.Reader termBytesReader;
- final HashMap<FieldInfo,FieldIndexData> fields = new HashMap<FieldInfo,FieldIndexData>();
+ final HashMap<FieldInfo,FieldIndexData> fields = new HashMap<>();
// start of the field info data
private long dirOffset;
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexWriter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexWriter.java Wed Mar 12 14:39:17 2014
@@ -58,7 +58,7 @@ public class FixedGapTermsIndexWriter ex
final private int termIndexInterval;
public static final int DEFAULT_TERM_INDEX_INTERVAL = 32;
- private final List<SimpleFieldWriter> fields = new ArrayList<SimpleFieldWriter>();
+ private final List<SimpleFieldWriter> fields = new ArrayList<>();
public FixedGapTermsIndexWriter(SegmentWriteState state) throws IOException {
this(state, DEFAULT_TERM_INDEX_INTERVAL);
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java Wed Mar 12 14:39:17 2014
@@ -45,7 +45,7 @@ public class VariableGapTermsIndexReader
private final PositiveIntOutputs fstOutputs = PositiveIntOutputs.getSingleton();
- final HashMap<FieldInfo,FieldIndexData> fields = new HashMap<FieldInfo,FieldIndexData>();
+ final HashMap<FieldInfo,FieldIndexData> fields = new HashMap<>();
// start of the field info data
private long dirOffset;
@@ -104,7 +104,7 @@ public class VariableGapTermsIndexReader
private BytesRefFSTEnum.InputOutput<Long> current;
public IndexEnum(FST<Long> fst) {
- fstEnum = new BytesRefFSTEnum<Long>(fst);
+ fstEnum = new BytesRefFSTEnum<>(fst);
}
@Override
@@ -158,7 +158,7 @@ public class VariableGapTermsIndexReader
public FieldIndexData(IndexInput in, FieldInfo fieldInfo, long indexStart) throws IOException {
IndexInput clone = in.clone();
clone.seek(indexStart);
- fst = new FST<Long>(clone, fstOutputs);
+ fst = new FST<>(clone, fstOutputs);
clone.close();
/*
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java Wed Mar 12 14:39:17 2014
@@ -55,7 +55,7 @@ public class VariableGapTermsIndexWriter
final static int VERSION_APPEND_ONLY = 1;
final static int VERSION_CURRENT = VERSION_APPEND_ONLY;
- private final List<FSTFieldWriter> fields = new ArrayList<FSTFieldWriter>();
+ private final List<FSTFieldWriter> fields = new ArrayList<>();
@SuppressWarnings("unused") private final FieldInfos fieldInfos; // unread
private final IndexTermSelector policy;
@@ -236,7 +236,7 @@ public class VariableGapTermsIndexWriter
public FSTFieldWriter(FieldInfo fieldInfo, long termsFilePointer) throws IOException {
this.fieldInfo = fieldInfo;
fstOutputs = PositiveIntOutputs.getSingleton();
- fstBuilder = new Builder<Long>(FST.INPUT_TYPE.BYTE1, fstOutputs);
+ fstBuilder = new Builder<>(FST.INPUT_TYPE.BYTE1, fstOutputs);
indexStart = out.getFilePointer();
////System.out.println("VGW: field=" + fieldInfo.name);
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java Wed Mar 12 14:39:17 2014
@@ -150,7 +150,7 @@ public final class BloomFilteringPosting
public class BloomFilteredFieldsProducer extends FieldsProducer {
private FieldsProducer delegateFieldsProducer;
- HashMap<String,FuzzySet> bloomsByFieldName = new HashMap<String,FuzzySet>();
+ HashMap<String,FuzzySet> bloomsByFieldName = new HashMap<>();
public BloomFilteredFieldsProducer(SegmentReadState state)
throws IOException {
@@ -394,7 +394,7 @@ public final class BloomFilteringPosting
class BloomFilteredFieldsConsumer extends FieldsConsumer {
private FieldsConsumer delegateFieldsConsumer;
- private Map<FieldInfo,FuzzySet> bloomFilters = new HashMap<FieldInfo,FuzzySet>();
+ private Map<FieldInfo,FuzzySet> bloomFilters = new HashMap<>();
private SegmentWriteState state;
public BloomFilteredFieldsConsumer(FieldsConsumer fieldsConsumer,
@@ -454,7 +454,7 @@ public final class BloomFilteringPosting
public void close() throws IOException {
// Now we are done accumulating values for these fields
- List<Entry<FieldInfo,FuzzySet>> nonSaturatedBlooms = new ArrayList<Map.Entry<FieldInfo,FuzzySet>>();
+ List<Entry<FieldInfo,FuzzySet>> nonSaturatedBlooms = new ArrayList<>();
for (Entry<FieldInfo,FuzzySet> entry : bloomFilters.entrySet()) {
FuzzySet bloomFilter = entry.getValue();
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java Wed Mar 12 14:39:17 2014
@@ -46,22 +46,22 @@ import org.apache.lucene.util.RamUsageEs
class DirectDocValuesProducer extends DocValuesProducer {
// metadata maps (just file pointers and minimal stuff)
- private final Map<Integer,NumericEntry> numerics = new HashMap<Integer,NumericEntry>();
- private final Map<Integer,BinaryEntry> binaries = new HashMap<Integer,BinaryEntry>();
- private final Map<Integer,SortedEntry> sorteds = new HashMap<Integer,SortedEntry>();
- private final Map<Integer,SortedSetEntry> sortedSets = new HashMap<Integer,SortedSetEntry>();
+ private final Map<Integer,NumericEntry> numerics = new HashMap<>();
+ private final Map<Integer,BinaryEntry> binaries = new HashMap<>();
+ private final Map<Integer,SortedEntry> sorteds = new HashMap<>();
+ private final Map<Integer,SortedSetEntry> sortedSets = new HashMap<>();
private final IndexInput data;
// ram instances we have already loaded
private final Map<Integer,NumericDocValues> numericInstances =
- new HashMap<Integer,NumericDocValues>();
+ new HashMap<>();
private final Map<Integer,BinaryDocValues> binaryInstances =
- new HashMap<Integer,BinaryDocValues>();
+ new HashMap<>();
private final Map<Integer,SortedDocValues> sortedInstances =
- new HashMap<Integer,SortedDocValues>();
+ new HashMap<>();
private final Map<Integer,SortedSetRawValues> sortedSetInstances =
- new HashMap<Integer,SortedSetRawValues>();
- private final Map<Integer,Bits> docsWithFieldInstances = new HashMap<Integer,Bits>();
+ new HashMap<>();
+ private final Map<Integer,Bits> docsWithFieldInstances = new HashMap<>();
private final int maxDoc;
private final AtomicLong ramBytesUsed;
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Wed Mar 12 14:39:17 2014
@@ -121,7 +121,7 @@ public final class DirectPostingsFormat
}
private static final class DirectFields extends FieldsProducer {
- private final Map<String,DirectField> fields = new TreeMap<String,DirectField>();
+ private final Map<String,DirectField> fields = new TreeMap<>();
public DirectFields(SegmentReadState state, Fields fields, int minSkipCount, int lowFreqCutoff) throws IOException {
for (String field : fields) {
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java Wed Mar 12 14:39:17 2014
@@ -69,7 +69,7 @@ import org.apache.lucene.codecs.memory.F
*/
public class FSTOrdTermsReader extends FieldsProducer {
static final int INTERVAL = FSTOrdTermsWriter.SKIP_INTERVAL;
- final TreeMap<String, TermsReader> fields = new TreeMap<String, TermsReader>();
+ final TreeMap<String, TermsReader> fields = new TreeMap<>();
final PostingsReaderBase postingsReader;
IndexInput indexIn = null;
IndexInput blockIn = null;
@@ -98,7 +98,7 @@ public class FSTOrdTermsReader extends F
long sumDocFreq = blockIn.readVLong();
int docCount = blockIn.readVInt();
int longsSize = blockIn.readVInt();
- FST<Long> index = new FST<Long>(indexIn, PositiveIntOutputs.getSingleton());
+ FST<Long> index = new FST<>(indexIn, PositiveIntOutputs.getSingleton());
TermsReader current = new TermsReader(fieldInfo, numTerms, sumTotalTermFreq, sumDocFreq, docCount, longsSize, index);
TermsReader previous = fields.put(fieldInfo.name, current);
@@ -427,7 +427,7 @@ public class FSTOrdTermsReader extends F
boolean seekPending;
SegmentTermsEnum() throws IOException {
- this.fstEnum = new BytesRefFSTEnum<Long>(index);
+ this.fstEnum = new BytesRefFSTEnum<>(index);
this.decoded = false;
this.seekPending = false;
}
@@ -521,7 +521,7 @@ public class FSTOrdTermsReader extends F
int state;
Frame() {
- this.arc = new FST.Arc<Long>();
+ this.arc = new FST.Arc<>();
this.state = -1;
}
@@ -781,7 +781,7 @@ public class FSTOrdTermsReader extends F
}
static<T> void walk(FST<T> fst) throws IOException {
- final ArrayList<FST.Arc<T>> queue = new ArrayList<FST.Arc<T>>();
+ final ArrayList<FST.Arc<T>> queue = new ArrayList<>();
final BitSet seen = new BitSet();
final FST.BytesReader reader = fst.getBytesReader();
final FST.Arc<T> startArc = fst.getFirstArc(new FST.Arc<T>());
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java Wed Mar 12 14:39:17 2014
@@ -154,7 +154,7 @@ public class FSTOrdTermsWriter extends F
final PostingsWriterBase postingsWriter;
final FieldInfos fieldInfos;
final int maxDoc;
- final List<FieldMetaData> fields = new ArrayList<FieldMetaData>();
+ final List<FieldMetaData> fields = new ArrayList<>();
IndexOutput blockOut = null;
IndexOutput indexOut = null;
@@ -305,7 +305,7 @@ public class FSTOrdTermsWriter extends F
this.fieldInfo = fieldInfo;
this.longsSize = postingsWriter.setField(fieldInfo);
this.outputs = PositiveIntOutputs.getSingleton();
- this.builder = new Builder<Long>(FST.INPUT_TYPE.BYTE1, outputs);
+ this.builder = new Builder<>(FST.INPUT_TYPE.BYTE1, outputs);
this.lastBlockStatsFP = 0;
this.lastBlockMetaLongsFP = 0;
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java Wed Mar 12 14:39:17 2014
@@ -65,7 +65,7 @@ import org.apache.lucene.codecs.CodecUti
*/
public class FSTTermsReader extends FieldsProducer {
- final TreeMap<String, TermsReader> fields = new TreeMap<String, TermsReader>();
+ final TreeMap<String, TermsReader> fields = new TreeMap<>();
final PostingsReaderBase postingsReader;
final IndexInput in;
//static boolean TEST = false;
@@ -172,7 +172,7 @@ public class FSTTermsReader extends Fiel
this.sumDocFreq = sumDocFreq;
this.docCount = docCount;
this.longsSize = longsSize;
- this.dict = new FST<FSTTermOutputs.TermData>(in, new FSTTermOutputs(fieldInfo, longsSize));
+ this.dict = new FST<>(in, new FSTTermOutputs(fieldInfo, longsSize));
}
@Override
@@ -307,7 +307,7 @@ public class FSTTermsReader extends Fiel
SegmentTermsEnum() throws IOException {
super();
- this.fstEnum = new BytesRefFSTEnum<FSTTermOutputs.TermData>(dict);
+ this.fstEnum = new BytesRefFSTEnum<>(dict);
this.decoded = false;
this.seekPending = false;
this.meta = null;
@@ -411,7 +411,7 @@ public class FSTTermsReader extends Fiel
int fsaState;
Frame() {
- this.fstArc = new FST.Arc<FSTTermOutputs.TermData>();
+ this.fstArc = new FST.Arc<>();
this.fsaState = -1;
}
@@ -697,7 +697,7 @@ public class FSTTermsReader extends Fiel
}
static<T> void walk(FST<T> fst) throws IOException {
- final ArrayList<FST.Arc<T>> queue = new ArrayList<FST.Arc<T>>();
+ final ArrayList<FST.Arc<T>> queue = new ArrayList<>();
final BitSet seen = new BitSet();
final FST.BytesReader reader = fst.getBytesReader();
final FST.Arc<T> startArc = fst.getFirstArc(new FST.Arc<T>());
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java Wed Mar 12 14:39:17 2014
@@ -130,7 +130,7 @@ public class FSTTermsWriter extends Fiel
final FieldInfos fieldInfos;
final IndexOutput out;
final int maxDoc;
- final List<FieldMetaData> fields = new ArrayList<FieldMetaData>();
+ final List<FieldMetaData> fields = new ArrayList<>();
public FSTTermsWriter(SegmentWriteState state, PostingsWriterBase postingsWriter) throws IOException {
final String termsFileName = IndexFileNames.segmentFileName(state.segmentInfo.name, state.segmentSuffix, TERMS_EXTENSION);
@@ -259,7 +259,7 @@ public class FSTTermsWriter extends Fiel
this.fieldInfo = fieldInfo;
this.longsSize = postingsWriter.setField(fieldInfo);
this.outputs = new FSTTermOutputs(fieldInfo, longsSize);
- this.builder = new Builder<FSTTermOutputs.TermData>(FST.INPUT_TYPE.BYTE1, outputs);
+ this.builder = new Builder<>(FST.INPUT_TYPE.BYTE1, outputs);
}
public void finishTerm(BytesRef text, BlockTermState state) throws IOException {
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesConsumer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesConsumer.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesConsumer.java Wed Mar 12 14:39:17 2014
@@ -158,7 +158,7 @@ class MemoryDocValuesConsumer extends Do
} else {
meta.writeByte(TABLE_COMPRESSED); // table-compressed
Long[] decode = uniqueValues.toArray(new Long[uniqueValues.size()]);
- final HashMap<Long,Integer> encode = new HashMap<Long,Integer>();
+ final HashMap<Long,Integer> encode = new HashMap<>();
data.writeVInt(decode.length);
for (int i = 0; i < decode.length; i++) {
data.writeLong(decode[i]);
@@ -281,7 +281,7 @@ class MemoryDocValuesConsumer extends Do
meta.writeByte(FST);
meta.writeLong(data.getFilePointer());
PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
- Builder<Long> builder = new Builder<Long>(INPUT_TYPE.BYTE1, outputs);
+ Builder<Long> builder = new Builder<>(INPUT_TYPE.BYTE1, outputs);
IntsRef scratch = new IntsRef();
long ord = 0;
for (BytesRef v : values) {
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java Wed Mar 12 14:39:17 2014
@@ -68,12 +68,12 @@ class MemoryDocValuesProducer extends Do
// ram instances we have already loaded
private final Map<Integer,NumericDocValues> numericInstances =
- new HashMap<Integer,NumericDocValues>();
+ new HashMap<>();
private final Map<Integer,BinaryDocValues> binaryInstances =
- new HashMap<Integer,BinaryDocValues>();
+ new HashMap<>();
private final Map<Integer,FST<Long>> fstInstances =
- new HashMap<Integer,FST<Long>>();
- private final Map<Integer,Bits> docsWithFieldInstances = new HashMap<Integer,Bits>();
+ new HashMap<>();
+ private final Map<Integer,Bits> docsWithFieldInstances = new HashMap<>();
private final int maxDoc;
private final AtomicLong ramBytesUsed;
@@ -104,9 +104,9 @@ class MemoryDocValuesProducer extends Do
version = CodecUtil.checkHeader(in, metaCodec,
VERSION_START,
VERSION_CURRENT);
- numerics = new HashMap<Integer,NumericEntry>();
- binaries = new HashMap<Integer,BinaryEntry>();
- fsts = new HashMap<Integer,FSTEntry>();
+ numerics = new HashMap<>();
+ binaries = new HashMap<>();
+ fsts = new HashMap<>();
readFields(in, state.fieldInfos);
ramBytesUsed = new AtomicLong(RamUsageEstimator.shallowSizeOfInstance(getClass()));
success = true;
@@ -314,7 +314,7 @@ class MemoryDocValuesProducer extends Do
instance = fstInstances.get(field.number);
if (instance == null) {
data.seek(entry.offset);
- instance = new FST<Long>(data, PositiveIntOutputs.getSingleton());
+ instance = new FST<>(data, PositiveIntOutputs.getSingleton());
ramBytesUsed.addAndGet(instance.sizeInBytes());
fstInstances.put(field.number, instance);
}
@@ -324,10 +324,10 @@ class MemoryDocValuesProducer extends Do
// per-thread resources
final BytesReader in = fst.getBytesReader();
- final Arc<Long> firstArc = new Arc<Long>();
- final Arc<Long> scratchArc = new Arc<Long>();
+ final Arc<Long> firstArc = new Arc<>();
+ final Arc<Long> scratchArc = new Arc<>();
final IntsRef scratchInts = new IntsRef();
- final BytesRefFSTEnum<Long> fstEnum = new BytesRefFSTEnum<Long>(fst);
+ final BytesRefFSTEnum<Long> fstEnum = new BytesRefFSTEnum<>(fst);
return new SortedDocValues() {
@Override
@@ -389,7 +389,7 @@ class MemoryDocValuesProducer extends Do
instance = fstInstances.get(field.number);
if (instance == null) {
data.seek(entry.offset);
- instance = new FST<Long>(data, PositiveIntOutputs.getSingleton());
+ instance = new FST<>(data, PositiveIntOutputs.getSingleton());
ramBytesUsed.addAndGet(instance.sizeInBytes());
fstInstances.put(field.number, instance);
}
@@ -399,10 +399,10 @@ class MemoryDocValuesProducer extends Do
// per-thread resources
final BytesReader in = fst.getBytesReader();
- final Arc<Long> firstArc = new Arc<Long>();
- final Arc<Long> scratchArc = new Arc<Long>();
+ final Arc<Long> firstArc = new Arc<>();
+ final Arc<Long> scratchArc = new Arc<>();
final IntsRef scratchInts = new IntsRef();
- final BytesRefFSTEnum<Long> fstEnum = new BytesRefFSTEnum<Long>(fst);
+ final BytesRefFSTEnum<Long> fstEnum = new BytesRefFSTEnum<>(fst);
final BytesRef ref = new BytesRef();
final ByteArrayDataInput input = new ByteArrayDataInput();
return new SortedSetDocValues() {
@@ -546,14 +546,14 @@ class MemoryDocValuesProducer extends Do
// maybe we should add a FSTEnum that supports this operation?
final FST<Long> fst;
final FST.BytesReader bytesReader;
- final Arc<Long> firstArc = new Arc<Long>();
- final Arc<Long> scratchArc = new Arc<Long>();
+ final Arc<Long> firstArc = new Arc<>();
+ final Arc<Long> scratchArc = new Arc<>();
final IntsRef scratchInts = new IntsRef();
final BytesRef scratchBytes = new BytesRef();
FSTTermsEnum(FST<Long> fst) {
this.fst = fst;
- in = new BytesRefFSTEnum<Long>(fst);
+ in = new BytesRefFSTEnum<>(fst);
bytesReader = fst.getBytesReader();
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java Wed Mar 12 14:39:17 2014
@@ -119,7 +119,7 @@ public final class MemoryPostingsFormat
this.field = field;
this.doPackFST = doPackFST;
this.acceptableOverheadRatio = acceptableOverheadRatio;
- builder = new Builder<BytesRef>(FST.INPUT_TYPE.BYTE1, 0, 0, true, true, Integer.MAX_VALUE, outputs, null, doPackFST, acceptableOverheadRatio, true, 15);
+ builder = new Builder<>(FST.INPUT_TYPE.BYTE1, 0, 0, true, true, Integer.MAX_VALUE, outputs, null, doPackFST, acceptableOverheadRatio, true, 15);
}
private class PostingsWriter {
@@ -740,7 +740,7 @@ public final class MemoryPostingsFormat
public FSTTermsEnum(FieldInfo field, FST<BytesRef> fst) {
this.field = field;
- fstEnum = new BytesRefFSTEnum<BytesRef>(fst);
+ fstEnum = new BytesRefFSTEnum<>(fst);
}
private void decodeMetaData() {
@@ -895,7 +895,7 @@ public final class MemoryPostingsFormat
sumDocFreq = in.readVLong();
docCount = in.readVInt();
- fst = new FST<BytesRef>(in, outputs);
+ fst = new FST<>(in, outputs);
}
@Override
@@ -953,7 +953,7 @@ public final class MemoryPostingsFormat
final String fileName = IndexFileNames.segmentFileName(state.segmentInfo.name, state.segmentSuffix, EXTENSION);
final IndexInput in = state.directory.openInput(fileName, IOContext.READONCE);
- final SortedMap<String,TermsReader> fields = new TreeMap<String,TermsReader>();
+ final SortedMap<String,TermsReader> fields = new TreeMap<>();
try {
while(true) {
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java Wed Mar 12 14:39:17 2014
@@ -76,7 +76,7 @@ public class PulsingPostingsReader exten
version < PulsingPostingsWriter.VERSION_META_ARRAY) {
fields = null;
} else {
- fields = new TreeMap<Integer, Integer>();
+ fields = new TreeMap<>();
String summaryFileName = IndexFileNames.segmentFileName(segmentState.segmentInfo.name, segmentState.segmentSuffix, PulsingPostingsWriter.SUMMARY_EXTENSION);
IndexInput in = null;
try {
@@ -628,7 +628,7 @@ public class PulsingPostingsReader exten
// another pulsing, because this is just stupid and wasteful.
// we still have to be careful in case someone does Pulsing(Stomping(Pulsing(...
private final Map<PulsingPostingsReader,DocsEnum> enums =
- new IdentityHashMap<PulsingPostingsReader,DocsEnum>();
+ new IdentityHashMap<>();
@Override
public Map<PulsingPostingsReader,DocsEnum> enums() {
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsWriter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsWriter.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsWriter.java Wed Mar 12 14:39:17 2014
@@ -125,7 +125,7 @@ public final class PulsingPostingsWriter
* for this term) is <= maxPositions, then the postings are
* inlined into terms dict */
public PulsingPostingsWriter(SegmentWriteState state, int maxPositions, PostingsWriterBase wrappedPostingsWriter) {
- fields = new ArrayList<FieldMetaData>();
+ fields = new ArrayList<>();
this.maxPositions = maxPositions;
// We simply wrap another postings writer, but only call
// on it when tot positions is >= the cutoff:
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java Wed Mar 12 14:39:17 2014
@@ -67,7 +67,7 @@ class SimpleTextDocValuesReader extends
final int maxDoc;
final IndexInput data;
final BytesRef scratch = new BytesRef();
- final Map<String,OneField> fields = new HashMap<String,OneField>();
+ final Map<String,OneField> fields = new HashMap<>();
public SimpleTextDocValuesReader(SegmentReadState state, String ext) throws IOException {
// System.out.println("dir=" + state.directory + " seg=" + state.segmentInfo.name + " file=" + IndexFileNames.segmentFileName(state.segmentInfo.name, state.segmentSuffix, ext));
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesWriter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesWriter.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesWriter.java Wed Mar 12 14:39:17 2014
@@ -52,7 +52,7 @@ class SimpleTextDocValuesWriter extends
final IndexOutput data;
final BytesRef scratch = new BytesRef();
final int numDocs;
- private final Set<String> fieldsSeen = new HashSet<String>(); // for asserting
+ private final Set<String> fieldsSeen = new HashSet<>(); // for asserting
public SimpleTextDocValuesWriter(SegmentWriteState state, String ext) throws IOException {
// System.out.println("WRITE: " + IndexFileNames.segmentFileName(state.segmentInfo.name, state.segmentSuffix, ext) + " " + state.segmentInfo.getDocCount() + " docs");
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosReader.java Wed Mar 12 14:39:17 2014
@@ -111,7 +111,7 @@ public class SimpleTextFieldInfosReader
SimpleTextUtil.readLine(input, scratch);
assert StringHelper.startsWith(scratch, NUM_ATTS);
int numAtts = Integer.parseInt(readString(NUM_ATTS.length, scratch));
- Map<String,String> atts = new HashMap<String,String>();
+ Map<String,String> atts = new HashMap<>();
for (int j = 0; j < numAtts; j++) {
SimpleTextUtil.readLine(input, scratch);
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java Wed Mar 12 14:39:17 2014
@@ -83,7 +83,7 @@ class SimpleTextFieldsReader extends Fie
private TreeMap<String,Long> readFields(IndexInput in) throws IOException {
BytesRef scratch = new BytesRef(10);
- TreeMap<String,Long> fields = new TreeMap<String,Long>();
+ TreeMap<String,Long> fields = new TreeMap<>();
while (true) {
SimpleTextUtil.readLine(in, scratch);
@@ -106,7 +106,7 @@ class SimpleTextFieldsReader extends Fie
public SimpleTextTermsEnum(FST<PairOutputs.Pair<Long,PairOutputs.Pair<Long,Long>>> fst, IndexOptions indexOptions) {
this.indexOptions = indexOptions;
- fstEnum = new BytesRefFSTEnum<PairOutputs.Pair<Long,PairOutputs.Pair<Long,Long>>>(fst);
+ fstEnum = new BytesRefFSTEnum<>(fst);
}
@Override
@@ -513,10 +513,10 @@ class SimpleTextFieldsReader extends Fie
private void loadTerms() throws IOException {
PositiveIntOutputs posIntOutputs = PositiveIntOutputs.getSingleton();
final Builder<PairOutputs.Pair<Long,PairOutputs.Pair<Long,Long>>> b;
- final PairOutputs<Long,Long> outputsInner = new PairOutputs<Long,Long>(posIntOutputs, posIntOutputs);
- final PairOutputs<Long,PairOutputs.Pair<Long,Long>> outputs = new PairOutputs<Long,PairOutputs.Pair<Long,Long>>(posIntOutputs,
+ final PairOutputs<Long,Long> outputsInner = new PairOutputs<>(posIntOutputs, posIntOutputs);
+ final PairOutputs<Long,PairOutputs.Pair<Long,Long>> outputs = new PairOutputs<>(posIntOutputs,
outputsInner);
- b = new Builder<PairOutputs.Pair<Long,PairOutputs.Pair<Long,Long>>>(FST.INPUT_TYPE.BYTE1, outputs);
+ b = new Builder<>(FST.INPUT_TYPE.BYTE1, outputs);
IndexInput in = SimpleTextFieldsReader.this.in.clone();
in.seek(termsStart);
final BytesRef lastTerm = new BytesRef(10);
@@ -633,7 +633,7 @@ class SimpleTextFieldsReader extends Fie
return Collections.unmodifiableSet(fields.keySet()).iterator();
}
- private final Map<String,SimpleTextTerms> termsCache = new HashMap<String,SimpleTextTerms>();
+ private final Map<String,SimpleTextTerms> termsCache = new HashMap<>();
@Override
synchronized public Terms terms(String field) throws IOException {
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java Wed Mar 12 14:39:17 2014
@@ -72,7 +72,7 @@ public class SimpleTextSegmentInfoReader
SimpleTextUtil.readLine(input, scratch);
assert StringHelper.startsWith(scratch, SI_NUM_DIAG);
int numDiag = Integer.parseInt(readString(SI_NUM_DIAG.length, scratch));
- Map<String,String> diagnostics = new HashMap<String,String>();
+ Map<String,String> diagnostics = new HashMap<>();
for (int i = 0; i < numDiag; i++) {
SimpleTextUtil.readLine(input, scratch);
@@ -88,7 +88,7 @@ public class SimpleTextSegmentInfoReader
SimpleTextUtil.readLine(input, scratch);
assert StringHelper.startsWith(scratch, SI_NUM_FILES);
int numFiles = Integer.parseInt(readString(SI_NUM_FILES.length, scratch));
- Set<String> files = new HashSet<String>();
+ Set<String> files = new HashSet<>();
for (int i = 0; i < numFiles; i++) {
SimpleTextUtil.readLine(input, scratch);
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java Wed Mar 12 14:39:17 2014
@@ -96,7 +96,7 @@ public class SimpleTextTermVectorsReader
@Override
public Fields get(int doc) throws IOException {
- SortedMap<String,SimpleTVTerms> fields = new TreeMap<String,SimpleTVTerms>();
+ SortedMap<String,SimpleTVTerms> fields = new TreeMap<>();
in.seek(offsets[doc]);
readLine();
assert StringHelper.startsWith(scratch, NUMFIELDS);
@@ -261,7 +261,7 @@ public class SimpleTextTermVectorsReader
this.hasOffsets = hasOffsets;
this.hasPositions = hasPositions;
this.hasPayloads = hasPayloads;
- terms = new TreeMap<BytesRef,SimpleTVPostings>();
+ terms = new TreeMap<>();
}
@Override
Modified: lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java Wed Mar 12 14:39:17 2014
@@ -56,7 +56,7 @@ public class TestPulsingReuse extends Lu
AtomicReader segment = getOnlySegmentReader(ir);
DocsEnum reuse = null;
- Map<DocsEnum,Boolean> allEnums = new IdentityHashMap<DocsEnum,Boolean>();
+ Map<DocsEnum,Boolean> allEnums = new IdentityHashMap<>();
TermsEnum te = segment.terms("foo").iterator(null);
while (te.next() != null) {
reuse = te.docs(null, reuse, DocsEnum.FLAG_NONE);
@@ -97,7 +97,7 @@ public class TestPulsingReuse extends Lu
AtomicReader segment = getOnlySegmentReader(ir);
DocsEnum reuse = null;
- Map<DocsEnum,Boolean> allEnums = new IdentityHashMap<DocsEnum,Boolean>();
+ Map<DocsEnum,Boolean> allEnums = new IdentityHashMap<>();
TermsEnum te = segment.terms("foo").iterator(null);
while (te.next() != null) {
reuse = te.docs(null, reuse, DocsEnum.FLAG_NONE);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java Wed Mar 12 14:39:17 2014
@@ -73,7 +73,7 @@ public abstract class Analyzer implement
private final ReuseStrategy reuseStrategy;
// non final as it gets nulled if closed; pkg private for access by ReuseStrategy's final helper methods:
- CloseableThreadLocal<Object> storedValue = new CloseableThreadLocal<Object>();
+ CloseableThreadLocal<Object> storedValue = new CloseableThreadLocal<>();
/**
* Create a new Analyzer, reusing the same set of components per-thread
@@ -417,7 +417,7 @@ public abstract class Analyzer implement
public void setReusableComponents(Analyzer analyzer, String fieldName, TokenStreamComponents components) {
Map<String, TokenStreamComponents> componentsPerField = (Map<String, TokenStreamComponents>) getStoredValue(analyzer);
if (componentsPerField == null) {
- componentsPerField = new HashMap<String, TokenStreamComponents>();
+ componentsPerField = new HashMap<>();
setStoredValue(analyzer, componentsPerField);
}
componentsPerField.put(fieldName, components);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/CachingTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/CachingTokenFilter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/CachingTokenFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/CachingTokenFilter.java Wed Mar 12 14:39:17 2014
@@ -51,7 +51,7 @@ public final class CachingTokenFilter ex
public final boolean incrementToken() throws IOException {
if (cache == null) {
// fill cache lazily
- cache = new LinkedList<AttributeSource.State>();
+ cache = new LinkedList<>();
fillCache();
iterator = cache.iterator();
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java Wed Mar 12 14:39:17 2014
@@ -96,7 +96,7 @@ public class BlockTreeTermsReader extend
// produce DocsEnum on demand
private final PostingsReaderBase postingsReader;
- private final TreeMap<String,FieldReader> fields = new TreeMap<String,FieldReader>();
+ private final TreeMap<String,FieldReader> fields = new TreeMap<>();
/** File offset where the directory starts in the terms file. */
private long dirOffset;
@@ -474,7 +474,7 @@ public class BlockTreeTermsReader extend
final IndexInput clone = indexIn.clone();
//System.out.println("start=" + indexStartFP + " field=" + fieldInfo.name);
clone.seek(indexStartFP);
- index = new FST<BytesRef>(clone, ByteSequenceOutputs.getSingleton());
+ index = new FST<>(clone, ByteSequenceOutputs.getSingleton());
/*
if (false) {
@@ -848,7 +848,7 @@ public class BlockTreeTermsReader extend
stack[idx] = new Frame(idx);
}
for(int arcIdx=0;arcIdx<arcs.length;arcIdx++) {
- arcs[arcIdx] = new FST.Arc<BytesRef>();
+ arcs[arcIdx] = new FST.Arc<>();
}
if (index == null) {
@@ -917,7 +917,7 @@ public class BlockTreeTermsReader extend
new FST.Arc[ArrayUtil.oversize(1+ord, RamUsageEstimator.NUM_BYTES_OBJECT_REF)];
System.arraycopy(arcs, 0, next, 0, arcs.length);
for(int arcOrd=arcs.length;arcOrd<next.length;arcOrd++) {
- next[arcOrd] = new FST.Arc<BytesRef>();
+ next[arcOrd] = new FST.Arc<>();
}
arcs = next;
}
@@ -1299,7 +1299,7 @@ public class BlockTreeTermsReader extend
// Init w/ root block; don't use index since it may
// not (and need not) have been loaded
for(int arcIdx=0;arcIdx<arcs.length;arcIdx++) {
- arcs[arcIdx] = new FST.Arc<BytesRef>();
+ arcs[arcIdx] = new FST.Arc<>();
}
currentFrame = staticFrame;
@@ -1441,7 +1441,7 @@ public class BlockTreeTermsReader extend
new FST.Arc[ArrayUtil.oversize(1+ord, RamUsageEstimator.NUM_BYTES_OBJECT_REF)];
System.arraycopy(arcs, 0, next, 0, arcs.length);
for(int arcOrd=arcs.length;arcOrd<next.length;arcOrd++) {
- next[arcOrd] = new FST.Arc<BytesRef>();
+ next[arcOrd] = new FST.Arc<>();
}
arcs = next;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java Wed Mar 12 14:39:17 2014
@@ -264,7 +264,7 @@ public class BlockTreeTermsWriter extend
}
}
- private final List<FieldMetaData> fields = new ArrayList<FieldMetaData>();
+ private final List<FieldMetaData> fields = new ArrayList<>();
// private final String segment;
/** Create a new writer. The number of items (terms or
@@ -462,7 +462,7 @@ public class BlockTreeTermsWriter extend
}
final ByteSequenceOutputs outputs = ByteSequenceOutputs.getSingleton();
- final Builder<BytesRef> indexBuilder = new Builder<BytesRef>(FST.INPUT_TYPE.BYTE1,
+ final Builder<BytesRef> indexBuilder = new Builder<>(FST.INPUT_TYPE.BYTE1,
0, 0, true, false, Integer.MAX_VALUE,
outputs, null, false,
PackedInts.COMPACT, true, 15);
@@ -510,7 +510,7 @@ public class BlockTreeTermsWriter extend
// Builder? Takes FST and unions it w/ current
// FST.
private void append(Builder<BytesRef> builder, FST<BytesRef> subIndex) throws IOException {
- final BytesRefFSTEnum<BytesRef> subIndexEnum = new BytesRefFSTEnum<BytesRef>(subIndex);
+ final BytesRefFSTEnum<BytesRef> subIndexEnum = new BytesRefFSTEnum<>(subIndex);
BytesRefFSTEnum.InputOutput<BytesRef> indexEnt;
while((indexEnt = subIndexEnum.next()) != null) {
//if (DEBUG) {
@@ -538,7 +538,7 @@ public class BlockTreeTermsWriter extend
private final Builder<Object> blockBuilder;
// PendingTerm or PendingBlock:
- private final List<PendingEntry> pending = new ArrayList<PendingEntry>();
+ private final List<PendingEntry> pending = new ArrayList<>();
// Index into pending of most recently written block
private int lastBlockIndex = -1;
@@ -593,7 +593,7 @@ public class BlockTreeTermsWriter extend
// stragglers! carry count upwards
node.inputCount = totCount;
}
- frontier[idx] = new Builder.UnCompiledNode<Object>(blockBuilder, idx);
+ frontier[idx] = new Builder.UnCompiledNode<>(blockBuilder, idx);
}
}
}
@@ -743,7 +743,7 @@ public class BlockTreeTermsWriter extend
int curStart = count;
subCount = 0;
- final List<PendingBlock> floorBlocks = new ArrayList<PendingBlock>();
+ final List<PendingBlock> floorBlocks = new ArrayList<>();
PendingBlock firstBlock = null;
for(int sub=0;sub<numSubs;sub++) {
@@ -925,7 +925,7 @@ public class BlockTreeTermsWriter extend
}
termCount = length;
} else {
- subIndices = new ArrayList<FST<BytesRef>>();
+ subIndices = new ArrayList<>();
termCount = 0;
for (PendingEntry ent : slice) {
if (ent.isTerm) {
@@ -1042,7 +1042,7 @@ public class BlockTreeTermsWriter extend
// This Builder is just used transiently to fragment
// terms into "good" blocks; we don't save the
// resulting FST:
- blockBuilder = new Builder<Object>(FST.INPUT_TYPE.BYTE1,
+ blockBuilder = new Builder<>(FST.INPUT_TYPE.BYTE1,
0, 0, true,
true, Integer.MAX_VALUE,
noOutputs,
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/Codec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/Codec.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/Codec.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/Codec.java Wed Mar 12 14:39:17 2014
@@ -39,7 +39,7 @@ import org.apache.lucene.util.NamedSPILo
public abstract class Codec implements NamedSPILoader.NamedSPI {
private static final NamedSPILoader<Codec> loader =
- new NamedSPILoader<Codec>(Codec.class);
+ new NamedSPILoader<>(Codec.class);
private final String name;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/DocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/DocValuesFormat.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/DocValuesFormat.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/DocValuesFormat.java Wed Mar 12 14:39:17 2014
@@ -41,7 +41,7 @@ import org.apache.lucene.util.NamedSPILo
public abstract class DocValuesFormat implements NamedSPILoader.NamedSPI {
private static final NamedSPILoader<DocValuesFormat> loader =
- new NamedSPILoader<DocValuesFormat>(DocValuesFormat.class);
+ new NamedSPILoader<>(DocValuesFormat.class);
/** Unique name that's used to retrieve this format when
* reading the index.
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/PostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/PostingsFormat.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/PostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/PostingsFormat.java Wed Mar 12 14:39:17 2014
@@ -42,7 +42,7 @@ import org.apache.lucene.util.NamedSPILo
public abstract class PostingsFormat implements NamedSPILoader.NamedSPI {
private static final NamedSPILoader<PostingsFormat> loader =
- new NamedSPILoader<PostingsFormat>(PostingsFormat.class);
+ new NamedSPILoader<>(PostingsFormat.class);
/** Zero-length {@code PostingsFormat} array. */
public static final PostingsFormat[] EMPTY = new PostingsFormat[0];