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 [22/27] - in /lucene/dev/trunk: lucene/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/
lucene/analysis/common/src/java/org/apache/lucene/a...
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java Wed Mar 12 14:39:17 2014
@@ -125,7 +125,7 @@ public abstract class FieldMutatingUpdat
private SelectorParams inclusions = new SelectorParams();
private Collection<SelectorParams> exclusions
- = new ArrayList<SelectorParams>();
+ = new ArrayList<>();
private FieldMutatingUpdateProcessor.FieldNameSelector selector = null;
@@ -139,13 +139,13 @@ public abstract class FieldMutatingUpdat
public static SelectorParams parseSelectorParams(NamedList args) {
SelectorParams params = new SelectorParams();
- params.fieldName = new HashSet<String>(args.removeConfigArgs("fieldName"));
- params.typeName = new HashSet<String>(args.removeConfigArgs("typeName"));
+ params.fieldName = new HashSet<>(args.removeConfigArgs("fieldName"));
+ params.typeName = new HashSet<>(args.removeConfigArgs("typeName"));
// we can compile the patterns now
Collection<String> patterns = args.removeConfigArgs("fieldRegex");
if (! patterns.isEmpty()) {
- params.fieldRegex = new ArrayList<Pattern>(patterns.size());
+ params.fieldRegex = new ArrayList<>(patterns.size());
for (String s : patterns) {
try {
params.fieldRegex.add(Pattern.compile(s));
@@ -167,7 +167,7 @@ public abstract class FieldMutatingUpdat
}
public static Collection<SelectorParams> parseSelectorExclusionParams(NamedList args) {
- Collection<SelectorParams> exclusions = new ArrayList<SelectorParams>();
+ Collection<SelectorParams> exclusions = new ArrayList<>();
List<Object> excList = args.getAll("exclude");
for (Object excObj : excList) {
if (null == excObj) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java Wed Mar 12 14:39:17 2014
@@ -89,7 +89,7 @@ class LogUpdateProcessor extends UpdateR
// TODO: make log level configurable as well, or is that overkill?
// (ryan) maybe? I added it mostly to show that it *can* be configurable
- this.toLog = new SimpleOrderedMap<Object>();
+ this.toLog = new SimpleOrderedMap<>();
}
@Override
@@ -101,7 +101,7 @@ class LogUpdateProcessor extends UpdateR
// Add a list of added id's to the response
if (adds == null) {
- adds = new ArrayList<String>();
+ adds = new ArrayList<>();
toLog.add("add",adds);
}
@@ -122,7 +122,7 @@ class LogUpdateProcessor extends UpdateR
if (cmd.isDeleteById()) {
if (deletes == null) {
- deletes = new ArrayList<String>();
+ deletes = new ArrayList<>();
toLog.add("delete",deletes);
}
if (deletes.size() < maxNumToLog) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseBooleanFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseBooleanFieldUpdateProcessorFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseBooleanFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseBooleanFieldUpdateProcessorFactory.java Wed Mar 12 14:39:17 2014
@@ -72,8 +72,8 @@ public class ParseBooleanFieldUpdateProc
private static final String FALSE_VALUES_PARAM = "falseValue";
private static final String CASE_SENSITIVE_PARAM = "caseSensitive";
- private Set<String> trueValues = new HashSet<String>(Arrays.asList(new String[] { "true" }));
- private Set<String> falseValues = new HashSet<String>(Arrays.asList(new String[] { "false" }));
+ private Set<String> trueValues = new HashSet<>(Arrays.asList(new String[] { "true" }));
+ private Set<String> falseValues = new HashSet<>(Arrays.asList(new String[] { "false" }));
private boolean caseSensitive = false;
@Override
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java Wed Mar 12 14:39:17 2014
@@ -102,7 +102,7 @@ public class ParseDateFieldUpdateProcess
private static final String DEFAULT_TIME_ZONE_PARAM = "defaultTimeZone";
private static final String LOCALE_PARAM = "locale";
- private Map<String,DateTimeFormatter> formats = new LinkedHashMap<String,DateTimeFormatter>();
+ private Map<String,DateTimeFormatter> formats = new LinkedHashMap<>();
@Override
public UpdateRequestProcessor getInstance(SolrQueryRequest req,
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java Wed Mar 12 14:39:17 2014
@@ -121,7 +121,7 @@ public class PreAnalyzedUpdateProcessorF
public void inform(SolrCore core) {
super.inform(core);
parser = new PreAnalyzedField();
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
if (parserImpl != null) {
args.put(PreAnalyzedField.PARSER_IMPL, parserImpl);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessor.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessor.java Wed Mar 12 14:39:17 2014
@@ -66,7 +66,7 @@ public class RegexpBoostProcessor extend
private String inputFieldname = DEFAULT_INPUT_FIELDNAME;
private String boostFieldname = DEFAULT_BOOST_FIELDNAME;
private String boostFilename;
- private List<BoostEntry> boostEntries = new ArrayList<BoostEntry>();
+ private List<BoostEntry> boostEntries = new ArrayList<>();
private static final String BOOST_ENTRIES_CACHE_KEY = "boost-entries";
RegexpBoostProcessor(SolrParams parameters,
@@ -119,7 +119,7 @@ public class RegexpBoostProcessor extend
}
private List<BoostEntry> initBoostEntries(InputStream is) throws IOException {
- List<BoostEntry> newBoostEntries = new ArrayList<BoostEntry>();
+ List<BoostEntry> newBoostEntries = new ArrayList<>();
BufferedReader reader = new BufferedReader(new InputStreamReader(is, Charset.forName("UTF-8")));
try {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessorFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/RegexpBoostProcessorFactory.java Wed Mar 12 14:39:17 2014
@@ -33,7 +33,7 @@ import org.apache.solr.response.SolrQuer
public class RegexpBoostProcessorFactory extends UpdateRequestProcessorFactory {
private SolrParams params;
- private final Map<Object, Object> sharedObjectCache = new HashMap<Object, Object>();
+ private final Map<Object, Object> sharedObjectCache = new HashMap<>();
@Override
public void init(@SuppressWarnings("rawtypes") final NamedList args) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java Wed Mar 12 14:39:17 2014
@@ -142,7 +142,7 @@ public class SignatureUpdateProcessorFac
"Can't use SignatureUpdateProcessor with partial updates on signature fields");
}
Collection<String> docFields = doc.getFieldNames();
- currDocSigFields = new ArrayList<String>(docFields.size());
+ currDocSigFields = new ArrayList<>(docFields.size());
currDocSigFields.addAll(docFields);
Collections.sort(currDocSigFields);
} else {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.java Wed Mar 12 14:39:17 2014
@@ -179,7 +179,7 @@ public class StatelessScriptUpdateProces
"StatelessScriptUpdateProcessorFactory must be " +
"initialized with at least one " + SCRIPT_ARG);
}
- scriptFiles = new ArrayList<ScriptFile>();
+ scriptFiles = new ArrayList<>();
for (String script : scripts) {
scriptFiles.add(new ScriptFile(script));
}
@@ -251,7 +251,7 @@ public class StatelessScriptUpdateProces
SolrQueryResponse rsp)
throws SolrException {
- List<EngineInfo> scriptEngines = new ArrayList<EngineInfo>();
+ List<EngineInfo> scriptEngines = new ArrayList<>();
ScriptEngineManager scriptEngineManager
= new ScriptEngineManager(resourceLoader.getClassLoader());
@@ -338,7 +338,7 @@ public class StatelessScriptUpdateProces
List<ScriptEngineFactory> factories = mgr.getEngineFactories();
if (null == factories) return result;
- Set<String> engines = new LinkedHashSet<String>(factories.size());
+ Set<String> engines = new LinkedHashSet<>(factories.size());
for (ScriptEngineFactory f : factories) {
if (ext) {
engines.addAll(f.getExtensions());
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java Wed Mar 12 14:39:17 2014
@@ -65,7 +65,7 @@ public class TextProfileSignature extend
@Override
public void add(String content) {
- HashMap<String, Token> tokens = new HashMap<String, Token>();
+ HashMap<String, Token> tokens = new HashMap<>();
StringBuilder curToken = new StringBuilder();
int maxFreq = 0;
@@ -105,7 +105,7 @@ public class TextProfileSignature extend
maxFreq = tok.cnt;
}
Iterator<Token> it = tokens.values().iterator();
- ArrayList<Token> profile = new ArrayList<Token>();
+ ArrayList<Token> profile = new ArrayList<>();
// calculate the QUANT value
int quant = Math.round(maxFreq * quantRate);
if (quant < 2) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java Wed Mar 12 14:39:17 2014
@@ -70,8 +70,8 @@ public class UniqFieldsUpdateProcessorFa
@Override
@SuppressWarnings("unchecked")
public Collection pickSubset(Collection values) {
- Set<Object> uniqs = new HashSet<Object>();
- List<Object> result = new ArrayList<Object>(values.size());
+ Set<Object> uniqs = new HashSet<>();
+ List<Object> result = new ArrayList<>(values.size());
for (Object o : values) {
if (!uniqs.contains(o)) {
uniqs.add(o);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java Wed Mar 12 14:39:17 2014
@@ -62,7 +62,7 @@ public class ConcurrentLFUCache<K, V> {
if (upperWaterMark < 1) throw new IllegalArgumentException("upperWaterMark must be > 0");
if (lowerWaterMark >= upperWaterMark)
throw new IllegalArgumentException("lowerWaterMark must be < upperWaterMark");
- map = new ConcurrentHashMap<Object, CacheEntry<K, V>>(initialSize);
+ map = new ConcurrentHashMap<>(initialSize);
newThreadForCleanup = runNewThreadForCleanup;
this.upperWaterMark = upperWaterMark;
this.lowerWaterMark = lowerWaterMark;
@@ -108,7 +108,7 @@ public class ConcurrentLFUCache<K, V> {
public V put(K key, V val) {
if (val == null) return null;
- CacheEntry<K, V> e = new CacheEntry<K, V>(key, val, stats.accessCounter.incrementAndGet());
+ CacheEntry<K, V> e = new CacheEntry<>(key, val, stats.accessCounter.incrementAndGet());
CacheEntry<K, V> oldCacheEntry = map.put(key, e);
int currentSize;
if (oldCacheEntry == null) {
@@ -171,7 +171,7 @@ public class ConcurrentLFUCache<K, V> {
int wantToRemove = sz - lowerWaterMark;
- TreeSet<CacheEntry> tree = new TreeSet<CacheEntry>();
+ TreeSet<CacheEntry> tree = new TreeSet<>();
for (CacheEntry<K, V> ce : map.values()) {
// set hitsCopy to avoid later Atomic reads
@@ -223,10 +223,10 @@ public class ConcurrentLFUCache<K, V> {
* @return a LinkedHashMap containing 'n' or less than 'n' entries
*/
public Map<K, V> getLeastUsedItems(int n) {
- Map<K, V> result = new LinkedHashMap<K, V>();
+ Map<K, V> result = new LinkedHashMap<>();
if (n <= 0)
return result;
- TreeSet<CacheEntry> tree = new TreeSet<CacheEntry>();
+ TreeSet<CacheEntry> tree = new TreeSet<>();
// we need to grab the lock since we are changing the copy variables
markAndSweepLock.lock();
try {
@@ -267,10 +267,10 @@ public class ConcurrentLFUCache<K, V> {
* @return a LinkedHashMap containing 'n' or less than 'n' entries
*/
public Map<K, V> getMostUsedItems(int n) {
- Map<K, V> result = new LinkedHashMap<K, V>();
+ Map<K, V> result = new LinkedHashMap<>();
if (n <= 0)
return result;
- TreeSet<CacheEntry> tree = new TreeSet<CacheEntry>();
+ TreeSet<CacheEntry> tree = new TreeSet<>();
// we need to grab the lock since we are changing the copy variables
markAndSweepLock.lock();
try {
@@ -427,7 +427,7 @@ public class ConcurrentLFUCache<K, V> {
private boolean stop = false;
public CleanupThread(ConcurrentLFUCache c) {
- cache = new WeakReference<ConcurrentLFUCache>(c);
+ cache = new WeakReference<>(c);
}
@Override
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java Wed Mar 12 14:39:17 2014
@@ -64,7 +64,7 @@ public class ConcurrentLRUCache<K,V> {
if (upperWaterMark < 1) throw new IllegalArgumentException("upperWaterMark must be > 0");
if (lowerWaterMark >= upperWaterMark)
throw new IllegalArgumentException("lowerWaterMark must be < upperWaterMark");
- map = new ConcurrentHashMap<Object, CacheEntry<K,V>>(initialSize);
+ map = new ConcurrentHashMap<>(initialSize);
newThreadForCleanup = runNewThreadForCleanup;
this.upperWaterMark = upperWaterMark;
this.lowerWaterMark = lowerWaterMark;
@@ -106,7 +106,7 @@ public class ConcurrentLRUCache<K,V> {
public V put(K key, V val) {
if (val == null) return null;
- CacheEntry<K,V> e = new CacheEntry<K,V>(key, val, stats.accessCounter.incrementAndGet());
+ CacheEntry<K,V> e = new CacheEntry<>(key, val, stats.accessCounter.incrementAndGet());
CacheEntry<K,V> oldCacheEntry = map.put(key, e);
int currentSize;
if (oldCacheEntry == null) {
@@ -284,7 +284,7 @@ public class ConcurrentLRUCache<K,V> {
wantToKeep = lowerWaterMark - numKept;
wantToRemove = sz - lowerWaterMark - numRemoved;
- PQueue<K,V> queue = new PQueue<K,V>(wantToRemove);
+ PQueue<K,V> queue = new PQueue<>(wantToRemove);
for (int i=eSize-1; i>=0; i--) {
CacheEntry<K,V> ce = eset[i];
@@ -408,10 +408,10 @@ public class ConcurrentLRUCache<K,V> {
* @return a LinkedHashMap containing 'n' or less than 'n' entries
*/
public Map<K, V> getOldestAccessedItems(int n) {
- Map<K, V> result = new LinkedHashMap<K, V>();
+ Map<K, V> result = new LinkedHashMap<>();
if (n <= 0)
return result;
- TreeSet<CacheEntry<K,V>> tree = new TreeSet<CacheEntry<K,V>>();
+ TreeSet<CacheEntry<K,V>> tree = new TreeSet<>();
markAndSweepLock.lock();
try {
for (Map.Entry<Object, CacheEntry<K,V>> entry : map.entrySet()) {
@@ -436,10 +436,10 @@ public class ConcurrentLRUCache<K,V> {
}
public Map<K,V> getLatestAccessedItems(int n) {
- Map<K,V> result = new LinkedHashMap<K,V>();
+ Map<K,V> result = new LinkedHashMap<>();
if (n <= 0)
return result;
- TreeSet<CacheEntry<K,V>> tree = new TreeSet<CacheEntry<K,V>>();
+ TreeSet<CacheEntry<K,V>> tree = new TreeSet<>();
// we need to grab the lock since we are changing lastAccessedCopy
markAndSweepLock.lock();
try {
@@ -587,7 +587,7 @@ public class ConcurrentLRUCache<K,V> {
private boolean stop = false;
public CleanupThread(ConcurrentLRUCache c) {
- cache = new WeakReference<ConcurrentLRUCache>(c);
+ cache = new WeakReference<>(c);
}
@Override
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/DOMUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/DOMUtil.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/DOMUtil.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/DOMUtil.java Wed Mar 12 14:39:17 2014
@@ -38,7 +38,7 @@ public class DOMUtil {
}
public static Map<String,String> toMapExcept(NamedNodeMap attrs, String... exclusions) {
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
outer: for (int j=0; j<attrs.getLength(); j++) {
Node attr = attrs.item(j);
@@ -101,7 +101,7 @@ public class DOMUtil {
}
public static NamedList<Object> nodesToNamedList(NodeList nlst) {
- NamedList<Object> clst = new NamedList<Object>();
+ NamedList<Object> clst = new NamedList<>();
for (int i=0; i<nlst.getLength(); i++) {
addToNamedList(nlst.item(i), clst, null);
}
@@ -307,8 +307,8 @@ public class DOMUtil {
return value;
}
- List<String> fragments = new ArrayList<String>();
- List<String> propertyRefs = new ArrayList<String>();
+ List<String> fragments = new ArrayList<>();
+ List<String> propertyRefs = new ArrayList<>();
parsePropertyString(value, fragments, propertyRefs);
StringBuilder sb = new StringBuilder();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/DateMathParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/DateMathParser.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/DateMathParser.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/DateMathParser.java Wed Mar 12 14:39:17 2014
@@ -128,7 +128,7 @@ public class DateMathParser {
// we probably need to change "Locale loc" to default to something
// from a param via SolrRequestInfo as well.
- Map<String,Integer> units = new HashMap<String,Integer>(13);
+ Map<String,Integer> units = new HashMap<>(13);
units.put("YEAR", Calendar.YEAR);
units.put("YEARS", Calendar.YEAR);
units.put("MONTH", Calendar.MONTH);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/MapListener.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/MapListener.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/MapListener.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/MapListener.java Wed Mar 12 14:39:17 2014
@@ -33,7 +33,7 @@ public class MapListener<K, V> extends F
public MapListener(Map<K, V> target) {
this.target = target;
- seenKeys = new HashSet<K>(target.size());
+ seenKeys = new HashSet<>(target.size());
}
public Set<K> getSeenKeys() {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/PropertiesUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/PropertiesUtil.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/PropertiesUtil.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/PropertiesUtil.java Wed Mar 12 14:39:17 2014
@@ -38,8 +38,8 @@ public class PropertiesUtil {
return value;
}
- List<String> fragments = new ArrayList<String>();
- List<String> propertyRefs = new ArrayList<String>();
+ List<String> fragments = new ArrayList<>();
+ List<String> propertyRefs = new ArrayList<>();
parsePropertyString(value, fragments, propertyRefs);
StringBuilder sb = new StringBuilder();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/RTimer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/RTimer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/RTimer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/RTimer.java Wed Mar 12 14:39:17 2014
@@ -47,7 +47,7 @@ public class RTimer {
public RTimer() {
time = 0;
culmTime = 0;
- children = new SimpleOrderedMap<RTimer>();
+ children = new SimpleOrderedMap<>();
startTime = now();
state = STARTED;
}
@@ -116,7 +116,7 @@ public class RTimer {
}
public NamedList asNamedList() {
- NamedList<Object> m = new SimpleOrderedMap<Object>();
+ NamedList<Object> m = new SimpleOrderedMap<>();
m.add( "time", time );
if( children.size() > 0 ) {
for( Map.Entry<String, RTimer> entry : children ) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java Wed Mar 12 14:39:17 2014
@@ -108,10 +108,10 @@ public class SimplePostTool {
static HashMap<String,String> mimeMap;
GlobFileFilter globFileFilter;
// Backlog for crawling
- List<LinkedHashSet<URL>> backlog = new ArrayList<LinkedHashSet<URL>>();
- Set<URL> visited = new HashSet<URL>();
+ List<LinkedHashSet<URL>> backlog = new ArrayList<>();
+ Set<URL> visited = new HashSet<>();
- static final Set<String> DATA_MODES = new HashSet<String>();
+ static final Set<String> DATA_MODES = new HashSet<>();
static final String USAGE_STRING_SHORT =
"Usage: java [SystemProperties] -jar post.jar [-h|-] [<file|folder|url|arg> [<file|folder|url|arg>...]]";
@@ -125,7 +125,7 @@ public class SimplePostTool {
DATA_MODES.add(DATA_MODE_STDIN);
DATA_MODES.add(DATA_MODE_WEB);
- mimeMap = new HashMap<String,String>();
+ mimeMap = new HashMap<>();
mimeMap.put("xml", "text/xml");
mimeMap.put("csv", "text/csv");
mimeMap.put("json", "application/json");
@@ -344,8 +344,8 @@ public class SimplePostTool {
private void reset() {
fileTypes = DEFAULT_FILE_TYPES;
globFileFilter = this.getFileFilterFromFileTypes(fileTypes);
- backlog = new ArrayList<LinkedHashSet<URL>>();
- visited = new HashSet<URL>();
+ backlog = new ArrayList<>();
+ visited = new HashSet<>();
}
@@ -512,7 +512,7 @@ public class SimplePostTool {
*/
public int postWebPages(String[] args, int startIndexInArgs, OutputStream out) {
reset();
- LinkedHashSet<URL> s = new LinkedHashSet<URL>();
+ LinkedHashSet<URL> s = new LinkedHashSet<>();
for (int j = startIndexInArgs; j < args.length; j++) {
try {
URL u = new URL(normalizeUrlEnding(args[j]));
@@ -558,7 +558,7 @@ public class SimplePostTool {
int rawStackSize = stack.size();
stack.removeAll(visited);
int stackSize = stack.size();
- LinkedHashSet<URL> subStack = new LinkedHashSet<URL>();
+ LinkedHashSet<URL> subStack = new LinkedHashSet<>();
info("Entering crawl at level "+level+" ("+rawStackSize+" links total, "+stackSize+" new)");
for(URL u : stack) {
try {
@@ -1016,7 +1016,7 @@ public class SimplePostTool {
final String DISALLOW = "Disallow:";
public PageFetcher() {
- robotsCache = new HashMap<String,List<String>>();
+ robotsCache = new HashMap<>();
}
public PageFetcherResult readPageFromUrl(URL u) {
@@ -1074,7 +1074,7 @@ public class SimplePostTool {
String strRobot = url.getProtocol() + "://" + host + "/robots.txt";
List<String> disallows = robotsCache.get(host);
if(disallows == null) {
- disallows = new ArrayList<String>();
+ disallows = new ArrayList<>();
URL urlRobot;
try {
urlRobot = new URL(strRobot);
@@ -1104,7 +1104,7 @@ public class SimplePostTool {
* @throws IOException if problems reading the stream
*/
protected List<String> parseRobotsTxt(InputStream is) throws IOException {
- List<String> disallows = new ArrayList<String>();
+ List<String> disallows = new ArrayList<>();
BufferedReader r = new BufferedReader(new InputStreamReader(is, "UTF-8"));
String l;
while((l = r.readLine()) != null) {
@@ -1130,7 +1130,7 @@ public class SimplePostTool {
* @return a set of URLs parsed from the page
*/
protected Set<URL> getLinksFromWebPage(URL u, InputStream is, String type, URL postUrl) {
- Set<URL> l = new HashSet<URL>();
+ Set<URL> l = new HashSet<>();
URL url = null;
try {
ByteArrayOutputStream os = new ByteArrayOutputStream();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java Wed Mar 12 14:39:17 2014
@@ -44,7 +44,7 @@ public class SolrLogLayout extends Layou
long startTime = System.currentTimeMillis();
long lastTime = startTime;
- Map<Method,String> methodAlias = new HashMap<Method,String>();
+ Map<Method,String> methodAlias = new HashMap<>();
public static class Method {
public String className;
@@ -81,9 +81,9 @@ public class SolrLogLayout extends Layou
Map<String,Object> coreProps;
}
- Map<Integer,CoreInfo> coreInfoMap = new WeakHashMap<Integer,CoreInfo>();
+ Map<Integer,CoreInfo> coreInfoMap = new WeakHashMap<>();
- public Map<String,String> classAliases = new HashMap<String,String>();
+ public Map<String,String> classAliases = new HashMap<>();
public void appendThread(StringBuilder sb, LoggingEvent event) {
Thread th = Thread.currentThread();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java Wed Mar 12 14:39:17 2014
@@ -194,7 +194,7 @@ public class SolrPluginUtils {
if (rb.doHighlights) {
// copy return fields list
- fieldFilter = new HashSet<String>(fieldFilter);
+ fieldFilter = new HashSet<>(fieldFilter);
// add highlight fields
SolrHighlighter highlighter = HighlightComponent.getHighlighter(req.getCore());
@@ -219,7 +219,7 @@ public class SolrPluginUtils {
public static Set<String> getDebugInterests(String[] params, ResponseBuilder rb){
- Set<String> debugInterests = new HashSet<String>();
+ Set<String> debugInterests = new HashSet<>();
if (params != null) {
for (int i = 0; i < params.length; i++) {
if (params[i].equalsIgnoreCase("all") || params[i].equalsIgnoreCase("true")){
@@ -346,7 +346,7 @@ public class SolrPluginUtils {
}
public static NamedList<Object> explanationToNamedList(Explanation e) {
- NamedList<Object> out = new SimpleOrderedMap<Object>();
+ NamedList<Object> out = new SimpleOrderedMap<>();
out.add("match", e.isMatch());
out.add("value", e.getValue());
@@ -358,7 +358,7 @@ public class SolrPluginUtils {
if (null == details || 0 == details.length) return out;
List<NamedList<Object>> kids
- = new ArrayList<NamedList<Object>>(details.length);
+ = new ArrayList<>(details.length);
for (Explanation d : details) {
kids.add(explanationToNamedList(d));
}
@@ -371,7 +371,7 @@ public class SolrPluginUtils {
(NamedList<Explanation> explanations) {
NamedList<NamedList<Object>> out
- = new SimpleOrderedMap<NamedList<Object>>();
+ = new SimpleOrderedMap<>();
for (Map.Entry<String,Explanation> entry : explanations) {
out.add(entry.getKey(), explanationToNamedList(entry.getValue()));
}
@@ -390,7 +390,7 @@ public class SolrPluginUtils {
SolrIndexSearcher searcher,
IndexSchema schema) throws IOException {
- NamedList<Explanation> explainList = new SimpleOrderedMap<Explanation>();
+ NamedList<Explanation> explainList = new SimpleOrderedMap<>();
DocIterator iterator = docs.iterator();
for (int i=0; i<docs.size(); i++) {
int id = iterator.nextDoc();
@@ -406,7 +406,7 @@ public class SolrPluginUtils {
private static NamedList<String> explanationsToStrings
(NamedList<Explanation> explanations) {
- NamedList<String> out = new SimpleOrderedMap<String>();
+ NamedList<String> out = new SimpleOrderedMap<>();
for (Map.Entry<String,Explanation> entry : explanations) {
out.add(entry.getKey(), "\n"+entry.getValue().toString());
}
@@ -470,9 +470,9 @@ public class SolrPluginUtils {
*/
public static Map<String,Float> parseFieldBoosts(String[] fieldLists) {
if (null == fieldLists || 0 == fieldLists.length) {
- return new HashMap<String,Float>();
+ return new HashMap<>();
}
- Map<String, Float> out = new HashMap<String,Float>(7);
+ Map<String, Float> out = new HashMap<>(7);
for (String in : fieldLists) {
if (null == in) {
continue;
@@ -502,9 +502,9 @@ public class SolrPluginUtils {
*/
public static List<FieldParams> parseFieldBoostsAndSlop(String[] fieldLists,int wordGrams,int defaultSlop) {
if (null == fieldLists || 0 == fieldLists.length) {
- return new ArrayList<FieldParams>();
+ return new ArrayList<>();
}
- List<FieldParams> out = new ArrayList<FieldParams>();
+ List<FieldParams> out = new ArrayList<>();
for (String in : fieldLists) {
if (null == in) {
continue;
@@ -738,7 +738,7 @@ public class SolrPluginUtils {
* string, to Alias object containing the fields to use in our
* DisjunctionMaxQuery and the tiebreaker to use.
*/
- protected Map<String,Alias> aliases = new HashMap<String,Alias>(3);
+ protected Map<String,Alias> aliases = new HashMap<>(3);
public DisjunctionMaxQueryParser(QParser qp, String defaultField) {
super(qp,defaultField);
// don't trust that our parent class won't ever change it's default
@@ -848,7 +848,7 @@ public class SolrPluginUtils {
public static List<Query> parseQueryStrings(SolrQueryRequest req,
String[] queries) throws SyntaxError {
if (null == queries || 0 == queries.length) return null;
- List<Query> out = new ArrayList<Query>(queries.length);
+ List<Query> out = new ArrayList<>(queries.length);
for (String q : queries) {
if (null != q && 0 != q.trim().length()) {
out.add(QParser.getParser(q, null, req).getQuery());
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/TimeZoneUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/TimeZoneUtils.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/TimeZoneUtils.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/TimeZoneUtils.java Wed Mar 12 14:39:17 2014
@@ -43,7 +43,7 @@ public final class TimeZoneUtils {
* @see TimeZone#getAvailableIDs
*/
public static final Set<String> KNOWN_TIMEZONE_IDS
- = Collections.unmodifiableSet(new HashSet<String>
+ = Collections.unmodifiableSet(new HashSet<>
(Arrays.asList(TimeZone.getAvailableIDs())));
/**
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/VersionedFile.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/VersionedFile.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/VersionedFile.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/VersionedFile.java Wed Mar 12 14:39:17 2014
@@ -63,7 +63,7 @@ public class VersionedFile
});
Arrays.sort(names);
f = new File(dir, names[names.length-1]);
- oldFiles = new ArrayList<File>();
+ oldFiles = new ArrayList<>();
for (int i=0; i<names.length-1; i++) {
oldFiles.add(new File(dir, names[i]));
}
@@ -88,11 +88,11 @@ public class VersionedFile
return is;
}
- private static final Set<File> deleteList = new HashSet<File>();
+ private static final Set<File> deleteList = new HashSet<>();
private static synchronized void delete(Collection<File> files) {
synchronized (deleteList) {
deleteList.addAll(files);
- List<File> deleted = new ArrayList<File>();
+ List<File> deleted = new ArrayList<>();
for (File df : deleteList) {
try {
df.delete();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java Wed Mar 12 14:39:17 2014
@@ -135,7 +135,7 @@ public abstract class AbstractPluginLoad
*/
public T load( SolrResourceLoader loader, NodeList nodes )
{
- List<PluginInitInfo> info = new ArrayList<PluginInitInfo>();
+ List<PluginInitInfo> info = new ArrayList<>();
T defaultPlugin = null;
if (nodes !=null ) {
@@ -218,7 +218,7 @@ public abstract class AbstractPluginLoad
*
*/
public T loadSingle(SolrResourceLoader loader, Node node) {
- List<PluginInitInfo> info = new ArrayList<PluginInitInfo>();
+ List<PluginInitInfo> info = new ArrayList<>();
T plugin = null;
try {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/stats/ExponentiallyDecayingSample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/stats/ExponentiallyDecayingSample.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/stats/ExponentiallyDecayingSample.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/stats/ExponentiallyDecayingSample.java Wed Mar 12 14:39:17 2014
@@ -72,7 +72,7 @@ public class ExponentiallyDecayingSample
* sample will be towards newer values
*/
public ExponentiallyDecayingSample(int reservoirSize, double alpha, Clock clock) {
- this.values = new ConcurrentSkipListMap<Double, Long>();
+ this.values = new ConcurrentSkipListMap<>();
this.lock = new ReentrantReadWriteLock();
this.alpha = alpha;
this.reservoirSize = reservoirSize;
@@ -187,7 +187,7 @@ public class ExponentiallyDecayingSample
try {
final long oldStartTime = startTime;
this.startTime = currentTimeInSeconds();
- final ArrayList<Double> keys = new ArrayList<Double>(values.keySet());
+ final ArrayList<Double> keys = new ArrayList<>(values.keySet());
for (Double key : keys) {
final Long value = values.remove(key);
values.put(key * exp(-alpha * (startTime - oldStartTime)), value);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/stats/Histogram.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/stats/Histogram.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/stats/Histogram.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/stats/Histogram.java Wed Mar 12 14:39:17 2014
@@ -74,7 +74,7 @@ public class Histogram {
// These are for the Welford algorithm for calculating running variance
// without floating-point doom.
private final AtomicReference<double[]> variance =
- new AtomicReference<double[]>(new double[]{-1, 0}); // M, S
+ new AtomicReference<>(new double[]{-1, 0}); // M, S
private final AtomicLong count = new AtomicLong();
/**
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/stats/UniformSample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/stats/UniformSample.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/stats/UniformSample.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/stats/UniformSample.java Wed Mar 12 14:39:17 2014
@@ -100,7 +100,7 @@ public class UniformSample implements Sa
@Override
public Snapshot getSnapshot() {
final int s = size();
- final List<Long> copy = new ArrayList<Long>(s);
+ final List<Long> copy = new ArrayList<>(s);
for (int i = 0; i < s; i++) {
copy.add(values.get(i));
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java Wed Mar 12 14:39:17 2014
@@ -351,7 +351,7 @@ public class BasicFunctionalityTest exte
final String BAD_VALUE = "NOT_A_NUMBER";
ignoreException(BAD_VALUE);
- final List<String> FIELDS = new LinkedList<String>();
+ final List<String> FIELDS = new LinkedList<>();
for (String type : new String[] { "ti", "tf", "td", "tl" }) {
FIELDS.add("malformed_" + type);
}
@@ -550,7 +550,7 @@ public class BasicFunctionalityTest exte
nl.add("bt","true");
nl.add("bf","false");
- Map<String,String> m = new HashMap<String,String>();
+ Map<String,String> m = new HashMap<>();
m.put("f.field1.i", "1000");
m.put("s", "BBB");
m.put("ss", "SSS");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java Wed Mar 12 14:39:17 2014
@@ -42,7 +42,7 @@ public class ConvertedLegacyTest extends
public void testABunchOfConvertedStuff() {
// these may be reused by things that need a special query
SolrQueryRequest req = null;
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
lrf.args.put(CommonParams.VERSION,"2.2");
lrf.args.put("defType","lucenePlusSort");
@@ -133,7 +133,7 @@ public class ConvertedLegacyTest extends
,"*[count(//doc)=3] "
,"//*[@start='0']"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
"standard", 2, 5 , args);
assertQ(req
@@ -142,28 +142,28 @@ public class ConvertedLegacyTest extends
,"*//doc[1]/str[.='pear'] "
,"//*[@start='2']"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
"standard", 3, 5 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
"standard", 4, 5 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
"standard", 25, 5 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
"standard", 0, 1 , args);
assertQ(req
@@ -171,7 +171,7 @@ public class ConvertedLegacyTest extends
,"*[count(//doc)=1] "
,"*//doc[1]/str[.='apple']"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
"standard", 0, 2 , args);
assertQ(req
@@ -179,7 +179,7 @@ public class ConvertedLegacyTest extends
,"*[count(//doc)=2] "
,"*//doc[2]/str[.='banana']"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
"standard", 1, 1 , args);
assertQ(req
@@ -187,35 +187,35 @@ public class ConvertedLegacyTest extends
,"*[count(//doc)=1] "
,"*//doc[1]/str[.='banana']"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
"standard", 3, 1 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
"standard", 4, 1 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
"standard", 1, 0 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
"standard", 0, 0 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z];val_s1 asc",
"standard", 0, 0 , args);
@@ -223,7 +223,7 @@ public class ConvertedLegacyTest extends
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z];val_s1 desc",
"standard", 0, 0 , args);
@@ -1107,7 +1107,7 @@ public class ConvertedLegacyTest extends
assertU("<commit/>");
assertQ(req("id:44")
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
args.put("fl","fname_s,arr_f ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44",
"standard", 0, 10, args);
@@ -1115,7 +1115,7 @@ public class ConvertedLegacyTest extends
,"//str[.='Yonik'] "
,"//float[.='1.4142135']"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
args.put("fl","fname_s,score");
req = new LocalSolrQueryRequest(h.getCore(), "id:44",
"standard", 0, 10, args);
@@ -1126,7 +1126,7 @@ public class ConvertedLegacyTest extends
// test addition of score field
- args = new HashMap<String,String>();
+ args = new HashMap<>();
args.put("fl","score,* ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44",
"standard", 0, 10, args);
@@ -1136,7 +1136,7 @@ public class ConvertedLegacyTest extends
,"//float[@name='score'] "
,"*[count(//doc/*)>=13]"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
args.put("fl","*,score ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44",
"standard", 0, 10, args);
@@ -1146,7 +1146,7 @@ public class ConvertedLegacyTest extends
,"//float[@name='score'] "
,"*[count(//doc/*)>=13]"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
args.put("fl","* ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44",
"standard", 0, 10, args);
@@ -1158,14 +1158,14 @@ public class ConvertedLegacyTest extends
// test maxScore
- args = new HashMap<String,String>();
+ args = new HashMap<>();
args.put("fl","score ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44",
"standard", 0, 10, args);
assertQ(req
,"//result[@maxScore>0]"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
args.put("fl","score ");
args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "id:44;id desc;",
@@ -1173,7 +1173,7 @@ public class ConvertedLegacyTest extends
assertQ(req
,"//result[@maxScore>0]"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
args.put("fl","score ");
args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "id:44;",
@@ -1181,7 +1181,7 @@ public class ConvertedLegacyTest extends
assertQ(req
,"//@maxScore = //doc/float[@name='score']"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
args.put("fl","score ");
args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "id:44;id desc;",
@@ -1189,7 +1189,7 @@ public class ConvertedLegacyTest extends
assertQ(req
,"//@maxScore = //doc/float[@name='score']"
);
- args = new HashMap<String,String>();
+ args = new HashMap<>();
args.put("fl","*,score");
args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "id:44;id desc;",
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/CursorPagingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/CursorPagingTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/CursorPagingTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/CursorPagingTest.java Wed Mar 12 14:39:17 2014
@@ -645,7 +645,7 @@ public class CursorPagingTest extends So
final boolean prune_dv = ! defaultCodecSupportsMissingDocValues();
- ArrayList<String> names = new ArrayList<String>(37);
+ ArrayList<String> names = new ArrayList<>(37);
for (String f : raw) {
if (f.equals("_version_")) {
continue;
@@ -760,7 +760,7 @@ public class CursorPagingTest extends So
assertNotNull("facet.field param not specified", facetField);
assertFalse("facet.field param contains multiple values", facetField.contains(","));
assertEquals("facet.limit param not set to -1", "-1", params.get("facet.limit"));
- final Map<String,MutableValueInt> facetCounts = new HashMap<String,MutableValueInt>();
+ final Map<String,MutableValueInt> facetCounts = new HashMap<>();
SentinelIntSet ids = new SentinelIntSet(maxSize, -1);
String cursorMark = CURSOR_MARK_START;
int docsOnThisPage = Integer.MAX_VALUE;
@@ -945,7 +945,7 @@ public class CursorPagingTest extends So
*/
public static String buildRandomSort(final Collection<String> fieldNames) {
- ArrayList<String> shuffledNames = new ArrayList<String>(fieldNames);
+ ArrayList<String> shuffledNames = new ArrayList<>(fieldNames);
Collections.replaceAll(shuffledNames, "id", "score");
Collections.shuffle(shuffledNames, random());
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java Wed Mar 12 14:39:17 2014
@@ -46,7 +46,7 @@ public class SolrInfoMBeanTest extends S
* a name, description, etc...
*/
public void testCallMBeanInfo() throws Exception {
- List<Class> classes = new ArrayList<Class>();
+ List<Class> classes = new ArrayList<>();
classes.addAll(getClassesForPackage(StandardRequestHandler.class.getPackage().getName()));
classes.addAll(getClassesForPackage(SearchHandler.class.getPackage().getName()));
classes.addAll(getClassesForPackage(SearchComponent.class.getPackage().getName()));
@@ -90,7 +90,7 @@ public class SolrInfoMBeanTest extends S
}
private static List<Class> getClassesForPackage(String pckgname) throws Exception {
- ArrayList<File> directories = new ArrayList<File>();
+ ArrayList<File> directories = new ArrayList<>();
ClassLoader cld = h.getCore().getResourceLoader().getClassLoader();
String path = pckgname.replace('.', '/');
Enumeration<URL> resources = cld.getResources(path);
@@ -102,7 +102,7 @@ public class SolrInfoMBeanTest extends S
directories.add(f);
}
- ArrayList<Class> classes = new ArrayList<Class>();
+ ArrayList<Class> classes = new ArrayList<>();
for (File directory : directories) {
if (directory.exists()) {
String[] files = directory.list();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java Wed Mar 12 14:39:17 2014
@@ -345,10 +345,10 @@ public class TestDistributedSearch exten
// test shards.tolerant=true
for(int numDownServers = 0; numDownServers < jettys.size()-1; numDownServers++)
{
- List<JettySolrRunner> upJettys = new ArrayList<JettySolrRunner>(jettys);
- List<SolrServer> upClients = new ArrayList<SolrServer>(clients);
- List<JettySolrRunner> downJettys = new ArrayList<JettySolrRunner>();
- List<String> upShards = new ArrayList<String>(Arrays.asList(shardsArr));
+ List<JettySolrRunner> upJettys = new ArrayList<>(jettys);
+ List<SolrServer> upClients = new ArrayList<>(clients);
+ List<JettySolrRunner> downJettys = new ArrayList<>();
+ List<String> upShards = new ArrayList<>(Arrays.asList(shardsArr));
for(int i=0; i<numDownServers; i++)
{
// shut down some of the jettys
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java Wed Mar 12 14:39:17 2014
@@ -38,7 +38,7 @@ public class TestDocumentBuilder extends
doc.addField("field2", "value1");
doc.addField("field3", "value2");
doc.addField("field4", 15);
- List<Integer> list = new ArrayList<Integer>();
+ List<Integer> list = new ArrayList<>();
list.add(45);
list.add(33);
list.add(20);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestGroupingSearch.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestGroupingSearch.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestGroupingSearch.java Wed Mar 12 14:39:17 2014
@@ -675,7 +675,7 @@ public class TestGroupingSearch extends
int indexSize = random().nextInt(25 * RANDOM_MULTIPLIER);
//indexSize=2;
- List<FldType> types = new ArrayList<FldType>();
+ List<FldType> types = new ArrayList<>();
types.add(new FldType("id",ONE_ONE, new SVal('A','Z',4,4)));
types.add(new FldType("score_f",ONE_ONE, new FVal(1,100))); // field used to score
types.add(new FldType("foo_i",ZERO_ONE, new IRange(0,indexSize)));
@@ -774,14 +774,14 @@ public class TestGroupingSearch extends
for (Grp grp : groups.values()) grp.setMaxDoc(sortComparator);
}
- List<Grp> sortedGroups = new ArrayList<Grp>(groups.values());
+ List<Grp> sortedGroups = new ArrayList<>(groups.values());
Collections.sort(sortedGroups, groupComparator==sortComparator ? createFirstDocComparator(sortComparator) : createMaxDocComparator(sortComparator));
boolean includeNGroups = random().nextBoolean();
Object modelResponse = buildGroupedResult(schema, sortedGroups, start, rows, group_offset, group_limit, includeNGroups);
boolean truncateGroups = random().nextBoolean();
- Map<String, Integer> facetCounts = new TreeMap<String, Integer>();
+ Map<String, Integer> facetCounts = new TreeMap<>();
if (truncateGroups) {
for (Grp grp : sortedGroups) {
Doc doc = grp.docs.get(0);
@@ -808,7 +808,7 @@ public class TestGroupingSearch extends
}
}
}
- List<Comparable> expectedFacetResponse = new ArrayList<Comparable>();
+ List<Comparable> expectedFacetResponse = new ArrayList<>();
for (Map.Entry<String, Integer> stringIntegerEntry : facetCounts.entrySet()) {
expectedFacetResponse.add(stringIntegerEntry.getKey());
expectedFacetResponse.add(stringIntegerEntry.getValue());
@@ -862,7 +862,7 @@ public class TestGroupingSearch extends
}
public static Object buildGroupedResult(IndexSchema schema, List<Grp> sortedGroups, int start, int rows, int group_offset, int group_limit, boolean includeNGroups) {
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
long matches = 0;
for (Grp grp : sortedGroups) {
@@ -877,13 +877,13 @@ public class TestGroupingSearch extends
for (int i=start; i<sortedGroups.size(); i++) {
if (rows != -1 && groupList.size() >= rows) break; // directly test rather than calculating, so we can catch any calc errors in the real code
- Map<String,Object> group = new LinkedHashMap<String,Object>();
+ Map<String,Object> group = new LinkedHashMap<>();
groupList.add(group);
Grp grp = sortedGroups.get(i);
group.put("groupValue", grp.groupValue);
- Map<String,Object> resultSet = new LinkedHashMap<String,Object>();
+ Map<String,Object> resultSet = new LinkedHashMap<>();
group.put("doclist", resultSet);
resultSet.put("numFound", grp.docs.size());
resultSet.put("start", group_offset);
@@ -924,7 +924,7 @@ public class TestGroupingSearch extends
}
public static Map<Comparable, Grp> groupBy(Collection<Doc> docs, String field) {
- Map<Comparable, Grp> groups = new HashMap<Comparable, Grp>();
+ Map<Comparable, Grp> groups = new HashMap<>();
for (Doc doc : docs) {
List<Comparable> vals = doc.getValues(field);
if (vals == null) {
@@ -932,7 +932,7 @@ public class TestGroupingSearch extends
if (grp == null) {
grp = new Grp();
grp.groupValue = null;
- grp.docs = new ArrayList<Doc>();
+ grp.docs = new ArrayList<>();
groups.put(null, grp);
}
grp.docs.add(doc);
@@ -943,7 +943,7 @@ public class TestGroupingSearch extends
if (grp == null) {
grp = new Grp();
grp.groupValue = val;
- grp.docs = new ArrayList<Doc>();
+ grp.docs = new ArrayList<>();
groups.put(grp.groupValue, grp);
}
grp.docs.add(doc);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestJoin.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestJoin.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestJoin.java Wed Mar 12 14:39:17 2014
@@ -150,7 +150,7 @@ public class TestJoin extends SolrTestCa
while (--indexIter >= 0) {
int indexSize = random().nextInt(20 * RANDOM_MULTIPLIER);
- List<FldType> types = new ArrayList<FldType>();
+ List<FldType> types = new ArrayList<>();
types.add(new FldType("id",ONE_ONE, new SVal('A','Z',4,4)));
types.add(new FldType("score_f",ONE_ONE, new FVal(1,100))); // field used to score
types.add(new FldType("small_s",ZERO_ONE, new SVal('a',(char)('c'+indexSize/3),1,1)));
@@ -164,7 +164,7 @@ public class TestJoin extends SolrTestCa
clearIndex();
Map<Comparable, Doc> model = indexDocs(types, null, indexSize);
- Map<String, Map<Comparable, Set<Comparable>>> pivots = new HashMap<String, Map<Comparable, Set<Comparable>>>();
+ Map<String, Map<Comparable, Set<Comparable>>> pivots = new HashMap<>();
for (int qiter=0; qiter<queryIter; qiter++) {
String fromField;
@@ -189,7 +189,7 @@ public class TestJoin extends SolrTestCa
Collection<Doc> fromDocs = model.values();
Set<Comparable> docs = join(fromDocs, pivot);
- List<Doc> docList = new ArrayList<Doc>(docs.size());
+ List<Doc> docList = new ArrayList<>(docs.size());
for (Comparable id : docs) docList.add(model.get(id));
Collections.sort(docList, createComparator("_docid_",true,false,false,false));
List sortedDocs = new ArrayList();
@@ -198,7 +198,7 @@ public class TestJoin extends SolrTestCa
sortedDocs.add(doc.toObject(h.getCore().getLatestSchema()));
}
- Map<String,Object> resultSet = new LinkedHashMap<String,Object>();
+ Map<String,Object> resultSet = new LinkedHashMap<>();
resultSet.put("numFound", docList.size());
resultSet.put("start", 0);
resultSet.put("docs", sortedDocs);
@@ -235,7 +235,7 @@ public class TestJoin extends SolrTestCa
Map<Comparable, Set<Comparable>> createJoinMap(Map<Comparable, Doc> model, String fromField, String toField) {
- Map<Comparable, Set<Comparable>> id_to_id = new HashMap<Comparable, Set<Comparable>>();
+ Map<Comparable, Set<Comparable>> id_to_id = new HashMap<>();
Map<Comparable, List<Comparable>> value_to_id = invertField(model, toField);
@@ -248,7 +248,7 @@ public class TestJoin extends SolrTestCa
if (toIds == null) continue;
Set<Comparable> ids = id_to_id.get(fromId);
if (ids == null) {
- ids = new HashSet<Comparable>();
+ ids = new HashSet<>();
id_to_id.put(fromId, ids);
}
for (Comparable toId : toIds)
@@ -261,7 +261,7 @@ public class TestJoin extends SolrTestCa
Set<Comparable> join(Collection<Doc> input, Map<Comparable, Set<Comparable>> joinMap) {
- Set<Comparable> ids = new HashSet<Comparable>();
+ Set<Comparable> ids = new HashSet<>();
for (Doc doc : input) {
Collection<Comparable> output = joinMap.get(doc.id);
if (output == null) continue;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java Wed Mar 12 14:39:17 2014
@@ -58,7 +58,7 @@ public class TestRandomDVFaceting extend
model = null;
indexSize = rand.nextBoolean() ? (rand.nextInt(10) + 1) : (rand.nextInt(100) + 10);
- types = new ArrayList<FldType>();
+ types = new ArrayList<>();
types.add(new FldType("id",ONE_ONE, new SVal('A','Z',4,4)));
types.add(new FldType("score_f",ONE_ONE, new FVal(1,100)));
types.add(new FldType("foo_i",ZERO_ONE, new IRange(0,indexSize)));
@@ -88,7 +88,7 @@ public class TestRandomDVFaceting extend
Random rand = random();
int percent = rand.nextInt(100);
if (model == null) return;
- ArrayList<String> ids = new ArrayList<String>(model.size());
+ ArrayList<String> ids = new ArrayList<>(model.size());
for (Comparable id : model.keySet()) {
if (rand.nextInt(100) < percent) {
ids.add(id.toString());
@@ -216,7 +216,7 @@ public class TestRandomDVFaceting extend
String facet_field = ftype.fname;
List<String> methods = multiValued ? multiValuedMethods : singleValuedMethods;
- List<String> responses = new ArrayList<String>(methods.size());
+ List<String> responses = new ArrayList<>(methods.size());
for (String method : methods) {
if (method.equals("dv")) {
params.set("facet.field", "{!key="+facet_field+"}"+facet_field+"_dv");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomFaceting.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomFaceting.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomFaceting.java Wed Mar 12 14:39:17 2014
@@ -53,7 +53,7 @@ public class TestRandomFaceting extends
model = null;
indexSize = rand.nextBoolean() ? (rand.nextInt(10) + 1) : (rand.nextInt(100) + 10);
- types = new ArrayList<FldType>();
+ types = new ArrayList<>();
types.add(new FldType("id",ONE_ONE, new SVal('A','Z',4,4)));
types.add(new FldType("score_f",ONE_ONE, new FVal(1,100)));
types.add(new FldType("small_f",ONE_ONE, new FVal(-4,5)));
@@ -87,7 +87,7 @@ public class TestRandomFaceting extends
Random rand = random();
int percent = rand.nextInt(100);
if (model == null) return;
- ArrayList<String> ids = new ArrayList<String>(model.size());
+ ArrayList<String> ids = new ArrayList<>(model.size());
for (Comparable id : model.keySet()) {
if (rand.nextInt(100) < percent) {
ids.add(id.toString());
@@ -209,7 +209,7 @@ public class TestRandomFaceting extends
params.set("facet.field", facet_field);
List<String> methods = multiValued ? multiValuedMethods : singleValuedMethods;
- List<String> responses = new ArrayList<String>(methods.size());
+ List<String> responses = new ArrayList<>(methods.size());
for (String method : methods) {
// params.add("facet.field", "{!key="+method+"}" + ftype.fname);
// TODO: allow method to be passed on local params?
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/LegacyHTMLStripCharFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/LegacyHTMLStripCharFilterTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/LegacyHTMLStripCharFilterTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/LegacyHTMLStripCharFilterTest.java Wed Mar 12 14:39:17 2014
@@ -80,7 +80,7 @@ public class LegacyHTMLStripCharFilterTe
public void testGamma() throws Exception {
String test = "Γ";
String gold = "\u0393";
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
set.add("reserved");
Reader reader = new LegacyHTMLStripCharFilter(new StringReader(test), set);
StringBuilder builder = new StringBuilder();
@@ -97,7 +97,7 @@ public class LegacyHTMLStripCharFilterTe
public void testEntities() throws Exception {
String test = " <foo> Übermensch = Γ bar Γ";
String gold = " <foo> \u00DCbermensch = \u0393 bar \u0393";
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
set.add("reserved");
Reader reader = new LegacyHTMLStripCharFilter(new StringReader(test), set);
StringBuilder builder = new StringBuilder();
@@ -114,7 +114,7 @@ public class LegacyHTMLStripCharFilterTe
public void testMoreEntities() throws Exception {
String test = " <junk/> ! @ and ’";
String gold = " <junk/> ! @ and â";
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
set.add("reserved");
Reader reader = new LegacyHTMLStripCharFilter(new StringReader(test), set);
StringBuilder builder = new StringBuilder();
@@ -130,7 +130,7 @@ public class LegacyHTMLStripCharFilterTe
public void testReserved() throws Exception {
String test = "aaa bbb <reserved ccc=\"ddddd\"> eeee </reserved> ffff <reserved ggg=\"hhhh\"/> <other/>";
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
set.add("reserved");
Reader reader = new LegacyHTMLStripCharFilter(new StringReader(test), set);
StringBuilder builder = new StringBuilder();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java Wed Mar 12 14:39:17 2014
@@ -44,7 +44,7 @@ import org.junit.Test;
import static org.apache.lucene.analysis.BaseTokenStreamTestCase.*;
public class TestReversedWildcardFilterFactory extends SolrTestCaseJ4 {
- Map<String,String> args = new HashMap<String, String>();
+ Map<String,String> args = new HashMap<>();
IndexSchema schema;
@BeforeClass
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java Wed Mar 12 14:39:17 2014
@@ -199,7 +199,7 @@ public class TestWordDelimiterFilterFact
public void testCustomTypes() throws Exception {
String testText = "I borrowed $5,400.00 at 25% interest-rate";
ResourceLoader loader = new SolrResourceLoader("solr/collection1");
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put("generateWordParts", "1");
args.put("generateNumberParts", "1");
args.put("catenateWords", "1");
@@ -221,7 +221,7 @@ public class TestWordDelimiterFilterFact
/* custom behavior */
- args = new HashMap<String,String>();
+ args = new HashMap<>();
// use a custom type mapping
args.put("generateWordParts", "1");
args.put("generateNumberParts", "1");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java Wed Mar 12 14:39:17 2014
@@ -51,7 +51,7 @@ import com.google.common.collect.ObjectA
public class AbstractAnalyticsStatsTest extends SolrTestCaseJ4 {
protected static final String[] BASEPARMS = new String[]{ "q", "*:*", "indent", "true", "olap", "true", "rows", "0" };
- protected static final HashMap<String,Object> defaults = new HashMap<String,Object>();
+ protected static final HashMap<String,Object> defaults = new HashMap<>();
public static enum VAL_TYPE {
INTEGER("int"),
@@ -162,7 +162,7 @@ public class AbstractAnalyticsStatsTest
} else if (stat.equals("count")) {
result = Long.valueOf(list.size());
} else if (stat.equals("unique")) {
- HashSet<T> set = new HashSet<T>();
+ HashSet<T> set = new HashSet<>();
set.addAll(list);
result = Long.valueOf((long)set.size());
} else if (stat.equals("max")) {
@@ -198,7 +198,7 @@ public class AbstractAnalyticsStatsTest
if (in == null) throw new FileNotFoundException("Resource not found: " + fileName);
Scanner file = new Scanner(in, "UTF-8");
try {
- ArrayList<String> strList = new ArrayList<String>();
+ ArrayList<String> strList = new ArrayList<>();
while (file.hasNextLine()) {
String line = file.nextLine();
line = line.trim();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/NoFacetTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/NoFacetTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/NoFacetTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/NoFacetTest.java Wed Mar 12 14:39:17 2014
@@ -72,12 +72,12 @@ public class NoFacetTest extends Abstrac
defaults.put("date_dtd", "1800-12-31T23:59:59Z");
defaults.put("string_sd", "str0");
- intTestStart = new ArrayList<Integer>();
- longTestStart = new ArrayList<Long>();
- floatTestStart = new ArrayList<Float>();
- doubleTestStart = new ArrayList<Double>();
- dateTestStart = new ArrayList<String>();
- stringTestStart = new ArrayList<String>();
+ intTestStart = new ArrayList<>();
+ longTestStart = new ArrayList<>();
+ floatTestStart = new ArrayList<>();
+ doubleTestStart = new ArrayList<>();
+ dateTestStart = new ArrayList<>();
+ stringTestStart = new ArrayList<>();
for (int j = 0; j < NUM_LOOPS; ++j) {
int i = j%INT;
@@ -86,7 +86,7 @@ public class NoFacetTest extends Abstrac
double d = j%DOUBLE;
String dt = (1800+j%DATE) + "-12-31T23:59:59Z";
String s = "str" + (j%STRING);
- List<String> fields = new ArrayList<String>();
+ List<String> fields = new ArrayList<>();
fields.add("id"); fields.add("1000"+j);
if( i != 0 ){
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/expression/ExpressionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/expression/ExpressionTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/expression/ExpressionTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/expression/ExpressionTest.java Wed Mar 12 14:39:17 2014
@@ -237,7 +237,7 @@ public class ExpressionTest extends Abst
if (in == null) throw new FileNotFoundException("Resource not found: " + fileName);
Scanner file = new Scanner(in, "UTF-8");
try {
- ArrayList<String> strList = new ArrayList<String>();
+ ArrayList<String> strList = new ArrayList<>();
while (file.hasNextLine()) {
String line = file.nextLine();
if (line.length()<2) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/AbstractAnalyticsFacetTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/AbstractAnalyticsFacetTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/AbstractAnalyticsFacetTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/AbstractAnalyticsFacetTest.java Wed Mar 12 14:39:17 2014
@@ -53,7 +53,7 @@ import javax.xml.xpath.XPathFactory;
@SuppressCodecs({"Lucene3x","Lucene40","Lucene41","Lucene42","Appending","Asserting"})
public class AbstractAnalyticsFacetTest extends SolrTestCaseJ4 {
- protected static final HashMap<String,Object> defaults = new HashMap<String,Object>();
+ protected static final HashMap<String,Object> defaults = new HashMap<>();
protected String latestType = "";
@@ -88,7 +88,7 @@ public class AbstractAnalyticsFacetTest
}
protected ArrayList<String> getStringList(String n1, String n2, String n3, String element, String n4)
throws XPathExpressionException {
- ArrayList<String> ret = new ArrayList<String>();
+ ArrayList<String> ret = new ArrayList<>();
NodeList nodes = getNodes(n1, n2, n3, element, n4);
for (int idx = 0; idx < nodes.getLength(); ++idx) {
ret.add(nodes.item(idx).getTextContent());
@@ -98,7 +98,7 @@ public class AbstractAnalyticsFacetTest
protected ArrayList<Integer> getIntegerList(String n1, String n2, String n3, String element, String n4)
throws XPathExpressionException {
- ArrayList<Integer> ret = new ArrayList<Integer>();
+ ArrayList<Integer> ret = new ArrayList<>();
NodeList nodes = getNodes(n1, n2, n3, element, n4);
for (int idx = 0; idx < nodes.getLength(); ++idx) {
ret.add(Integer.parseInt(nodes.item(idx).getTextContent()));
@@ -107,7 +107,7 @@ public class AbstractAnalyticsFacetTest
}
protected ArrayList<Long> getLongList(String n1, String n2, String n3, String element, String n4)
throws XPathExpressionException {
- ArrayList<Long> ret = new ArrayList<Long>();
+ ArrayList<Long> ret = new ArrayList<>();
NodeList nodes = getNodes(n1, n2, n3, element, n4);
for (int idx = 0; idx < nodes.getLength(); ++idx) {
ret.add(Long.parseLong(nodes.item(idx).getTextContent()));
@@ -116,7 +116,7 @@ public class AbstractAnalyticsFacetTest
}
protected ArrayList<Float> getFloatList(String n1, String n2, String n3, String element, String n4)
throws XPathExpressionException {
- ArrayList<Float> ret = new ArrayList<Float>();
+ ArrayList<Float> ret = new ArrayList<>();
NodeList nodes = getNodes(n1, n2, n3, element, n4);
for (int idx = 0; idx < nodes.getLength(); ++idx) {
ret.add(Float.parseFloat(nodes.item(idx).getTextContent()));
@@ -126,7 +126,7 @@ public class AbstractAnalyticsFacetTest
protected ArrayList<Double> getDoubleList(String n1, String n2, String n3, String element, String n4)
throws XPathExpressionException {
- ArrayList<Double> ret = new ArrayList<Double>();
+ ArrayList<Double> ret = new ArrayList<>();
NodeList nodes = getNodes(n1, n2, n3, element, n4);
for (int idx = 0; idx < nodes.getLength(); ++idx) {
ret.add(Double.parseDouble(nodes.item(idx).getTextContent()));
@@ -141,7 +141,7 @@ public class AbstractAnalyticsFacetTest
}
public static String[] filter(String...args){
- List<String> l = new ArrayList<String>();
+ List<String> l = new ArrayList<>();
for( int i=0; i <args.length; i+=2){
if( args[i+1].equals("0") || args[i+1].equals("0.0") ||
args[i+1].equals("1800-12-31T23:59:59Z") || args[i+1].equals("str0") ||
@@ -237,7 +237,7 @@ public class AbstractAnalyticsFacetTest
} else if (stat.equals("unique")) {
result = new ArrayList<Long>();
for (List<T> list : lists) {
- HashSet<T> set = new HashSet<T>();
+ HashSet<T> set = new HashSet<>();
set.addAll(list);
result.add((long)set.size());
}
@@ -285,7 +285,7 @@ public class AbstractAnalyticsFacetTest
if (in == null) throw new FileNotFoundException("Resource not found: " + fileName);
Scanner file = new Scanner(in, "UTF-8");
try {
- ArrayList<String> strList = new ArrayList<String>();
+ ArrayList<String> strList = new ArrayList<>();
while (file.hasNextLine()) {
String line = file.nextLine();
if (line.length()<2) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetExtrasTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetExtrasTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetExtrasTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetExtrasTest.java Wed Mar 12 14:39:17 2014
@@ -51,10 +51,10 @@ public class FieldFacetExtrasTest extend
h.update("<delete><query>*:*</query></delete>");
//INT
- intLongTestStart = new ArrayList<ArrayList<Integer>>();
- intFloatTestStart = new ArrayList<ArrayList<Integer>>();
- intDoubleTestStart = new ArrayList<ArrayList<Integer>>();
- intStringTestStart = new ArrayList<ArrayList<Integer>>();
+ intLongTestStart = new ArrayList<>();
+ intFloatTestStart = new ArrayList<>();
+ intDoubleTestStart = new ArrayList<>();
+ intStringTestStart = new ArrayList<>();
for (int j = 0; j < NUM_LOOPS; ++j) {
int i = j%INT;
@@ -67,7 +67,7 @@ public class FieldFacetExtrasTest extend
"double_dd", "" + d, "date_dtd", (1800+dt) + "-12-31T23:59:59.999Z", "string_sd", "abc" + s));
//Long
if (j-LONG<0) {
- ArrayList<Integer> list1 = new ArrayList<Integer>();
+ ArrayList<Integer> list1 = new ArrayList<>();
list1.add(i);
intLongTestStart.add(list1);
} else {
@@ -75,7 +75,7 @@ public class FieldFacetExtrasTest extend
}
//String
if (j-FLOAT<0) {
- ArrayList<Integer> list1 = new ArrayList<Integer>();
+ ArrayList<Integer> list1 = new ArrayList<>();
list1.add(i);
intFloatTestStart.add(list1);
} else {
@@ -83,7 +83,7 @@ public class FieldFacetExtrasTest extend
}
//String
if (j-DOUBLE<0) {
- ArrayList<Integer> list1 = new ArrayList<Integer>();
+ ArrayList<Integer> list1 = new ArrayList<>();
list1.add(i);
intDoubleTestStart.add(list1);
} else {
@@ -91,7 +91,7 @@ public class FieldFacetExtrasTest extend
}
//String
if (j-STRING<0) {
- ArrayList<Integer> list1 = new ArrayList<Integer>();
+ ArrayList<Integer> list1 = new ArrayList<>();
list1.add(i);
intStringTestStart.add(list1);
} else {
@@ -127,7 +127,7 @@ public class FieldFacetExtrasTest extend
Collection<Double> lon;
- List<Double> all = new ArrayList<Double>();
+ List<Double> all = new ArrayList<>();
lon = getDoubleList("off0", "fieldFacets", "long_ld", "double", "mean");
assertEquals(getRawResponse(), lon.size(),2);
assertArrayEquals(new Double[]{ 1.5, 2.0 }, lon.toArray(new Double[0]));