You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/03/12 19:14:27 UTC
svn commit: r1576837 [4/29] - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/
lucene/analysis/com...
Modified: lucene/dev/branches/branch_4x/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java Wed Mar 12 18:14:05 2014
@@ -70,8 +70,8 @@ import java.util.List;
* for which a Trie is constructed.
*/
public class Trie {
- List<Row> rows = new ArrayList<Row>();
- List<CharSequence> cmds = new ArrayList<CharSequence>();
+ List<Row> rows = new ArrayList<>();
+ List<CharSequence> cmds = new ArrayList<>();
int root;
boolean forward = false;
Modified: lucene/dev/branches/branch_4x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java Wed Mar 12 18:14:05 2014
@@ -31,7 +31,7 @@ public class UIMAAnnotationsTokenizerFac
private String descriptorPath;
private String tokenType;
- private final Map<String,Object> configurationParameters = new HashMap<String,Object>();
+ private final Map<String,Object> configurationParameters = new HashMap<>();
/** Creates a new UIMAAnnotationsTokenizerFactory */
public UIMAAnnotationsTokenizerFactory(Map<String,String> args) {
Modified: lucene/dev/branches/branch_4x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java Wed Mar 12 18:14:05 2014
@@ -32,7 +32,7 @@ public class UIMATypeAwareAnnotationsTok
private String descriptorPath;
private String tokenType;
private String featurePath;
- private final Map<String,Object> configurationParameters = new HashMap<String,Object>();
+ private final Map<String,Object> configurationParameters = new HashMap<>();
/** Creates a new UIMATypeAwareAnnotationsTokenizerFactory */
public UIMATypeAwareAnnotationsTokenizerFactory(Map<String,String> args) {
Modified: lucene/dev/branches/branch_4x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java Wed Mar 12 18:14:05 2014
@@ -27,7 +27,7 @@ public class AEProviderFactory {
private static final AEProviderFactory instance = new AEProviderFactory();
- private final Map<String, AEProvider> providerCache = new HashMap<String, AEProvider>();
+ private final Map<String, AEProvider> providerCache = new HashMap<>();
private AEProviderFactory() {
// Singleton
Modified: lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java Wed Mar 12 18:14:05 2014
@@ -127,7 +127,7 @@ public class UIMABaseAnalyzerTest extend
@Test
public void testRandomStringsWithConfigurationParameters() throws Exception {
- Map<String, Object> cp = new HashMap<String, Object>();
+ Map<String, Object> cp = new HashMap<>();
cp.put("line-end", "\r");
checkRandomData(random(), new UIMABaseAnalyzer("/uima/TestWSTokenizerAE.xml", "org.apache.lucene.uima.ts.TokenAnnotation", cp),
100 * RANDOM_MULTIPLIER);
Modified: lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProviderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProviderTest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProviderTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProviderTest.java Wed Mar 12 18:14:05 2014
@@ -53,7 +53,7 @@ public class OverridingParamsAEProviderT
@Test
public void testOverridingParamsInitialization() throws Exception {
- Map<String, Object> runtimeParameters = new HashMap<String, Object>();
+ Map<String, Object> runtimeParameters = new HashMap<>();
runtimeParameters.put("ngramsize", "3");
AEProvider aeProvider = new OverridingParamsAEProvider("/uima/AggregateSentenceAE.xml", runtimeParameters);
AnalysisEngine analysisEngine = aeProvider.getAE();
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java Wed Mar 12 18:14:05 2014
@@ -81,7 +81,7 @@ public class PerfRunData implements Clos
// directory, analyzer, docMaker - created at startup.
// reader, writer, searcher - maintained by basic tasks.
private Directory directory;
- private Map<String,AnalyzerFactory> analyzerFactories = new HashMap<String,AnalyzerFactory>();
+ private Map<String,AnalyzerFactory> analyzerFactories = new HashMap<>();
private Analyzer analyzer;
private DocMaker docMaker;
private ContentSource contentSource;
@@ -102,7 +102,7 @@ public class PerfRunData implements Clos
private Config config;
private long startTimeMillis;
- private final HashMap<String, Object> perfObjects = new HashMap<String, Object>();
+ private final HashMap<String, Object> perfObjects = new HashMap<>();
// constructor
public PerfRunData (Config config) throws Exception {
@@ -125,7 +125,7 @@ public class PerfRunData implements Clos
"org.apache.lucene.benchmark.byTask.feeds.RandomFacetSource")).asSubclass(FacetSource.class).newInstance();
facetSource.setConfig(config);
// query makers
- readTaskQueryMaker = new HashMap<Class<? extends ReadTask>,QueryMaker>();
+ readTaskQueryMaker = new HashMap<>();
qmkrClass = Class.forName(config.get("query.maker","org.apache.lucene.benchmark.byTask.feeds.SimpleQueryMaker")).asSubclass(QueryMaker.class);
// index stuff
@@ -147,7 +147,7 @@ public class PerfRunData implements Clos
docMaker, facetSource, contentSource);
// close all perf objects that are closeable.
- ArrayList<Closeable> perfObjectsToClose = new ArrayList<Closeable>();
+ ArrayList<Closeable> perfObjectsToClose = new ArrayList<>();
for (Object obj : perfObjects.values()) {
if (obj instanceof Closeable) {
perfObjectsToClose.add((Closeable) obj);
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java Wed Mar 12 18:14:05 2014
@@ -147,7 +147,7 @@ public class DemoHTMLParser implements H
}
private static final Set<String> createElementNameSet(String... names) {
- return Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(names)));
+ return Collections.unmodifiableSet(new HashSet<>(Arrays.asList(names)));
}
/** HTML elements that cause a line break (they are block-elements) */
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java Wed Mar 12 18:14:05 2014
@@ -82,7 +82,7 @@ public class DirContentSource extends Co
int count = 0;
- Stack<File> stack = new Stack<File>();
+ Stack<File> stack = new Stack<>();
/* this seems silly ... there must be a better way ...
not that this is good, but can it matter? */
@@ -156,7 +156,7 @@ public class DirContentSource extends Co
}
- private ThreadLocal<DateFormatInfo> dateFormat = new ThreadLocal<DateFormatInfo>();
+ private ThreadLocal<DateFormatInfo> dateFormat = new ThreadLocal<>();
private File dataDir = null;
private int iteration = 0;
private Iterator inputFiles = null;
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java Wed Mar 12 18:14:05 2014
@@ -108,8 +108,8 @@ public class DocMaker implements Closeab
this.reuseFields = reuseFields;
if (reuseFields) {
- fields = new HashMap<String,Field>();
- numericFields = new HashMap<String,Field>();
+ fields = new HashMap<>();
+ numericFields = new HashMap<>();
// Initialize the map with the default fields.
fields.put(BODY_FIELD, new Field(BODY_FIELD, "", bodyFt));
@@ -192,9 +192,9 @@ public class DocMaker implements Closeab
}
// leftovers are thread local, because it is unsafe to share residues between threads
- private ThreadLocal<LeftOver> leftovr = new ThreadLocal<LeftOver>();
- private ThreadLocal<DocState> docState = new ThreadLocal<DocState>();
- private ThreadLocal<DateUtil> dateParsers = new ThreadLocal<DateUtil>();
+ private ThreadLocal<LeftOver> leftovr = new ThreadLocal<>();
+ private ThreadLocal<DocState> docState = new ThreadLocal<>();
+ private ThreadLocal<DateUtil> dateParsers = new ThreadLocal<>();
public static final String BODY_FIELD = "body";
public static final String TITLE_FIELD = "doctitle";
@@ -458,7 +458,7 @@ public class DocMaker implements Closeab
// In a multi-rounds run, it is important to reset DocState since settings
// of fields may change between rounds, and this is the only way to reset
// the cache of all threads.
- docState = new ThreadLocal<DocState>();
+ docState = new ThreadLocal<>();
indexProperties = config.get("doc.index.props", false);
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java Wed Mar 12 18:14:05 2014
@@ -254,7 +254,7 @@ public class EnwikiContentSource extends
}
- private static final Map<String,Integer> ELEMENTS = new HashMap<String,Integer>();
+ private static final Map<String,Integer> ELEMENTS = new HashMap<>();
private static final int TITLE = 0;
private static final int DATE = TITLE + 1;
private static final int BODY = DATE + 1;
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java Wed Mar 12 18:14:05 2014
@@ -94,7 +94,7 @@ public class EnwikiQueryMaker extends Ab
*/
private static Query[] createQueries(List<Object> qs, Analyzer a) {
QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, DocMaker.BODY_FIELD, a);
- List<Object> queries = new ArrayList<Object>();
+ List<Object> queries = new ArrayList<>();
for (int i = 0; i < qs.size(); i++) {
try {
@@ -127,7 +127,7 @@ public class EnwikiQueryMaker extends Ab
// analyzer (default is standard analyzer)
Analyzer anlzr = NewAnalyzerTask.createAnalyzer(config.get("analyzer", StandardAnalyzer.class.getName()));
- List<Object> queryList = new ArrayList<Object>(20);
+ List<Object> queryList = new ArrayList<>(20);
queryList.addAll(Arrays.asList(STANDARD_QUERIES));
if(!config.get("enwikiQueryMaker.disableSpanQueries", false))
queryList.addAll(Arrays.asList(getPrebuiltQueries(DocMaker.BODY_FIELD)));
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java Wed Mar 12 18:14:05 2014
@@ -54,7 +54,7 @@ public class FileBasedQueryMaker extends
QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, defaultField, anlzr);
qp.setAllowLeadingWildcard(true);
- List<Query> qq = new ArrayList<Query>();
+ List<Query> qq = new ArrayList<>();
String fileName = config.get("file.query.maker.file", null);
if (fileName != null)
{
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java Wed Mar 12 18:14:05 2014
@@ -49,9 +49,9 @@ public class ReutersContentSource extend
ParsePosition pos;
}
- private ThreadLocal<DateFormatInfo> dateFormat = new ThreadLocal<DateFormatInfo>();
+ private ThreadLocal<DateFormatInfo> dateFormat = new ThreadLocal<>();
private File dataDir = null;
- private ArrayList<File> inputFiles = new ArrayList<File>();
+ private ArrayList<File> inputFiles = new ArrayList<>();
private int nextFile = 0;
private int iteration = 0;
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java Wed Mar 12 18:14:05 2014
@@ -74,7 +74,7 @@ public class ReutersQueryMaker extends A
*/
private static Query[] createQueries(List<Object> qs, Analyzer a) {
QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, DocMaker.BODY_FIELD, a);
- List<Object> queries = new ArrayList<Object>();
+ List<Object> queries = new ArrayList<>();
for (int i = 0; i < qs.size(); i++) {
try {
@@ -108,7 +108,7 @@ public class ReutersQueryMaker extends A
Analyzer anlzr= NewAnalyzerTask.createAnalyzer(config.get("analyzer",
"org.apache.lucene.analysis.standard.StandardAnalyzer"));
- List<Object> queryList = new ArrayList<Object>(20);
+ List<Object> queryList = new ArrayList<>(20);
queryList.addAll(Arrays.asList(STANDARD_QUERIES));
queryList.addAll(Arrays.asList(getPrebuiltQueries(DocMaker.BODY_FIELD)));
return createQueries(queryList, anlzr);
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java Wed Mar 12 18:14:05 2014
@@ -49,7 +49,7 @@ public class SimpleQueryMaker extends Ab
"org.apache.lucene.analysis.standard.StandardAnalyzer"));
QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, DocMaker.BODY_FIELD,anlzr);
- ArrayList<Query> qq = new ArrayList<Query>();
+ ArrayList<Query> qq = new ArrayList<>();
Query q1 = new TermQuery(new Term(DocMaker.ID_FIELD,"doc2"));
qq.add(q1);
Query q2 = new TermQuery(new Term(DocMaker.BODY_FIELD,"simple"));
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java Wed Mar 12 18:14:05 2014
@@ -36,7 +36,7 @@ public class SimpleSloppyPhraseQueryMake
protected Query[] prepareQueries() throws Exception {
// extract some 100 words from doc text to an array
String words[];
- ArrayList<String> w = new ArrayList<String>();
+ ArrayList<String> w = new ArrayList<>();
StringTokenizer st = new StringTokenizer(SingleDocSource.DOC_TEXT);
while (st.hasMoreTokens() && w.size()<100) {
w.add(st.nextToken());
@@ -44,7 +44,7 @@ public class SimpleSloppyPhraseQueryMake
words = w.toArray(new String[0]);
// create queries (that would find stuff) with varying slops
- ArrayList<Query> queries = new ArrayList<Query>();
+ ArrayList<Query> queries = new ArrayList<>();
for (int slop=0; slop<8; slop++) {
for (int qlen=2; qlen<6; qlen++) {
for (int wd=0; wd<words.length-qlen-slop; wd++) {
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java Wed Mar 12 18:14:05 2014
@@ -50,7 +50,7 @@ public class SpatialDocMaker extends Doc
public static final String SPATIAL_FIELD = "spatial";
//cache spatialStrategy by round number
- private static Map<Integer,SpatialStrategy> spatialStrategyCache = new HashMap<Integer,SpatialStrategy>();
+ private static Map<Integer,SpatialStrategy> spatialStrategyCache = new HashMap<>();
private SpatialStrategy strategy;
private ShapeConverter shapeConverter;
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java Wed Mar 12 18:14:05 2014
@@ -71,7 +71,7 @@ public class SpatialFileQueryMaker exten
srcConfig.set("line.parser", config.get("query.file.line.parser", null));
srcConfig.set("content.source.forever", "false");
- List<Query> queries = new ArrayList<Query>();
+ List<Query> queries = new ArrayList<>();
LineDocSource src = new LineDocSource();
try {
src.setConfig(srcConfig);
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java Wed Mar 12 18:14:05 2014
@@ -79,10 +79,10 @@ public class TrecContentSource extends C
"hhmm z.z.z. MMM dd, yyyy", // 0901 u.t.c. April 28, 1994
};
- private ThreadLocal<DateFormatInfo> dateFormats = new ThreadLocal<DateFormatInfo>();
- private ThreadLocal<StringBuilder> trecDocBuffer = new ThreadLocal<StringBuilder>();
+ private ThreadLocal<DateFormatInfo> dateFormats = new ThreadLocal<>();
+ private ThreadLocal<StringBuilder> trecDocBuffer = new ThreadLocal<>();
private File dataDir = null;
- private ArrayList<File> inputFiles = new ArrayList<File>();
+ private ArrayList<File> inputFiles = new ArrayList<>();
private int nextFile = 0;
// Use to synchronize threads on reading from the TREC documents.
private Object lock = new Object();
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java Wed Mar 12 18:14:05 2014
@@ -35,7 +35,7 @@ public abstract class TrecDocParser {
/** trec parser type used for unknown extensions */
public static final ParsePathType DEFAULT_PATH_TYPE = ParsePathType.GOV2;
- static final Map<ParsePathType,TrecDocParser> pathType2parser = new HashMap<ParsePathType,TrecDocParser>();
+ static final Map<ParsePathType,TrecDocParser> pathType2parser = new HashMap<>();
static {
pathType2parser.put(ParsePathType.GOV2, new TrecGov2Parser());
pathType2parser.put(ParsePathType.FBIS, new TrecFBISParser());
@@ -44,7 +44,7 @@ public abstract class TrecDocParser {
pathType2parser.put(ParsePathType.LATIMES, new TrecLATimesParser());
}
- static final Map<String,ParsePathType> pathName2Type = new HashMap<String,ParsePathType>();
+ static final Map<String,ParsePathType> pathName2Type = new HashMap<>();
static {
for (ParsePathType ppt : ParsePathType.values()) {
pathName2Type.put(ppt.name().toUpperCase(Locale.ROOT),ppt);
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java Wed Mar 12 18:14:05 2014
@@ -32,7 +32,7 @@ public class Points {
// stat points ordered by their start time.
// for now we collect points as TaskStats objects.
// later might optimize to collect only native data.
- private ArrayList<TaskStats> points = new ArrayList<TaskStats>();
+ private ArrayList<TaskStats> points = new ArrayList<>();
private int nextTaskRunNum = 0;
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java Wed Mar 12 18:14:05 2014
@@ -74,7 +74,7 @@ public class AddFacetedDocTask extends A
@Override
public int doLogic() throws Exception {
if (config != null) {
- List<FacetField> facets = new ArrayList<FacetField>();
+ List<FacetField> facets = new ArrayList<>();
getRunData().getFacetSource().getNextFacets(facets);
for(FacetField ff : facets) {
doc.add(ff);
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java Wed Mar 12 18:14:05 2014
@@ -88,9 +88,9 @@ public class AnalyzerFactoryTask extends
String factoryName = null;
Integer positionIncrementGap = null;
Integer offsetGap = null;
- private List<CharFilterFactory> charFilterFactories = new ArrayList<CharFilterFactory>();
+ private List<CharFilterFactory> charFilterFactories = new ArrayList<>();
private TokenizerFactory tokenizerFactory = null;
- private List<TokenFilterFactory> tokenFilterFactories = new ArrayList<TokenFilterFactory>();
+ private List<TokenFilterFactory> tokenFilterFactories = new ArrayList<>();
public AnalyzerFactoryTask(PerfRunData runData) {
super(runData);
@@ -287,7 +287,7 @@ public class AnalyzerFactoryTask extends
*/
private void createAnalysisPipelineComponent
(StreamTokenizer stok, Class<? extends AbstractAnalysisFactory> clazz) {
- Map<String,String> argMap = new HashMap<String,String>();
+ Map<String,String> argMap = new HashMap<>();
boolean parenthetical = false;
try {
WHILE_LOOP: while (stok.nextToken() != StreamTokenizer.TT_EOF) {
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java Wed Mar 12 18:14:05 2014
@@ -298,7 +298,7 @@ public abstract class ReadTask extends P
*/
protected Collection<String> getFieldsToHighlight(Document document) {
List<IndexableField> fields = document.getFields();
- Set<String> result = new HashSet<String>(fields.size());
+ Set<String> result = new HashSet<>(fields.size());
for (final IndexableField f : fields) {
result.add(f.name());
}
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java Wed Mar 12 18:14:05 2014
@@ -137,7 +137,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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java Wed Mar 12 18:14:05 2014
@@ -67,7 +67,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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java Wed Mar 12 18:14:05 2014
@@ -134,7 +134,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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/Trec1MQReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/Trec1MQReader.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/Trec1MQReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/Trec1MQReader.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecJudge.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecJudge.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecJudge.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecJudge.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java (original)
+++ lucene/dev/branches/branch_4x/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java (original)
+++ lucene/dev/branches/branch_4x/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java Wed Mar 12 18:14:05 2014
@@ -110,7 +110,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) {
TokenStream tokenStream = analyzer.tokenStream(textFieldName, doc);
try {
@@ -150,7 +150,7 @@ public class SimpleNaiveBayesClassifier
}
}
double score = 10 / Math.abs(max);
- return new ClassificationResult<BytesRef>(foundClass, score);
+ return new ClassificationResult<>(foundClass, score);
}
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java Wed Mar 12 18:14:05 2014
@@ -67,7 +67,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/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java Wed Mar 12 18:14:05 2014
@@ -93,7 +93,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/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java Wed Mar 12 18:14:05 2014
@@ -67,7 +67,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/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexWriter.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexWriter.java Wed Mar 12 18:14:05 2014
@@ -54,7 +54,7 @@ public class FixedGapTermsIndexWriter ex
final private int termIndexInterval;
- private final List<SimpleFieldWriter> fields = new ArrayList<SimpleFieldWriter>();
+ private final List<SimpleFieldWriter> fields = new ArrayList<>();
@SuppressWarnings("unused") private final FieldInfos fieldInfos; // unread
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java Wed Mar 12 18:14:05 2014
@@ -51,7 +51,7 @@ public class VariableGapTermsIndexReader
private IndexInput in;
private volatile boolean indexLoaded;
- 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;
@@ -119,7 +119,7 @@ public class VariableGapTermsIndexReader
private BytesRefFSTEnum.InputOutput<Long> current;
public IndexEnum(FST<Long> fst) {
- fstEnum = new BytesRefFSTEnum<Long>(fst);
+ fstEnum = new BytesRefFSTEnum<>(fst);
}
@Override
@@ -185,7 +185,7 @@ public class VariableGapTermsIndexReader
if (fst == null) {
IndexInput clone = in.clone();
clone.seek(indexStart);
- fst = new FST<Long>(clone, fstOutputs);
+ fst = new FST<>(clone, fstOutputs);
clone.close();
/*
@@ -200,8 +200,8 @@ public class VariableGapTermsIndexReader
// subsample
final IntsRef scratchIntsRef = new IntsRef();
final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
- final Builder<Long> builder = new Builder<Long>(FST.INPUT_TYPE.BYTE1, outputs);
- final BytesRefFSTEnum<Long> fstEnum = new BytesRefFSTEnum<Long>(fst);
+ final Builder<Long> builder = new Builder<>(FST.INPUT_TYPE.BYTE1, outputs);
+ final BytesRefFSTEnum<Long> fstEnum = new BytesRefFSTEnum<>(fst);
BytesRefFSTEnum.InputOutput<Long> result;
int count = indexDivisor;
while((result = fstEnum.next()) != null) {
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java Wed Mar 12 18:14:05 2014
@@ -154,7 +154,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 {
@@ -415,7 +415,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;
@@ -443,7 +443,7 @@ public final class BloomFilteringPosting
public void close() throws IOException {
delegateFieldsConsumer.close();
// 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/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java Wed Mar 12 18:14:05 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/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Wed Mar 12 18:14:05 2014
@@ -122,7 +122,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/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java Wed Mar 12 18:14:05 2014
@@ -70,7 +70,7 @@ import org.apache.lucene.util.fst.Util;
*/
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;
@@ -99,7 +99,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);
@@ -439,7 +439,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;
}
@@ -533,7 +533,7 @@ public class FSTOrdTermsReader extends F
int state;
Frame() {
- this.arc = new FST.Arc<Long>();
+ this.arc = new FST.Arc<>();
this.state = -1;
}
@@ -793,7 +793,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/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java Wed Mar 12 18:14:05 2014
@@ -154,7 +154,7 @@ public class FSTOrdTermsWriter extends F
final PostingsWriterBase postingsWriter;
final FieldInfos fieldInfos;
- final List<FieldMetaData> fields = new ArrayList<FieldMetaData>();
+ final List<FieldMetaData> fields = new ArrayList<>();
IndexOutput blockOut = null;
IndexOutput indexOut = null;
@@ -275,7 +275,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/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java Wed Mar 12 18:14:05 2014
@@ -66,7 +66,7 @@ import org.apache.lucene.util.fst.Util;
*/
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;
@@ -173,7 +173,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
@@ -313,7 +313,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;
@@ -422,7 +422,7 @@ public class FSTTermsReader extends Fiel
int fsaState;
Frame() {
- this.fstArc = new FST.Arc<FSTTermOutputs.TermData>();
+ this.fstArc = new FST.Arc<>();
this.fsaState = -1;
}
@@ -713,7 +713,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/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java Wed Mar 12 18:14:05 2014
@@ -130,7 +130,7 @@ public class FSTTermsWriter extends Fiel
final PostingsWriterBase postingsWriter;
final FieldInfos fieldInfos;
final IndexOutput out;
- 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);
@@ -225,7 +225,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);
}
@Override