You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/07/09 19:05:05 UTC
svn commit: r1359283 [5/5] - in /lucene/dev/branches/lucene3312: ./ lucene/
lucene/analysis/ lucene/analysis/common/
lucene/analysis/common/src/java/org/apache/lucene/analysis/br/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/ l...
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java Mon Jul 9 17:04:57 2012
@@ -255,9 +255,9 @@ public class SolrInfoMBeanHandler extend
.append(ref).append(", Now: ").append(now);
if(ref instanceof Number) {
- NumberFormat nf = NumberFormat.getIntegerInstance(Locale.ENGLISH);
+ NumberFormat nf = NumberFormat.getIntegerInstance(Locale.ROOT);
if((ref instanceof Double) || (ref instanceof Float)) {
- nf = NumberFormat.getInstance(Locale.ENGLISH);
+ nf = NumberFormat.getInstance(Locale.ROOT);
}
double dref = ((Number)ref).doubleValue();
double dnow = ((Number)now).doubleValue();
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Mon Jul 9 17:04:57 2012
@@ -19,13 +19,16 @@ package org.apache.solr.handler.admin;
import java.io.DataInputStream;
import java.io.File;
+import java.io.InputStreamReader;
import java.lang.management.ManagementFactory;
import java.lang.management.OperatingSystemMXBean;
import java.lang.management.RuntimeMXBean;
import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.nio.charset.Charset;
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
import java.util.Date;
import java.util.Locale;
@@ -131,7 +134,7 @@ public class SystemInfoHandler extends R
addGetterIfAvaliable( os, "maxFileDescriptorCount", info );
try {
- if( !os.getName().toLowerCase(Locale.ENGLISH).startsWith( "windows" ) ) {
+ if( !os.getName().toLowerCase(Locale.ROOT).startsWith( "windows" ) ) {
// Try some command line things
info.add( "uname", execute( "uname -a" ) );
info.add( "uptime", execute( "uptime" ) );
@@ -180,7 +183,7 @@ public class SystemInfoHandler extends R
process = Runtime.getRuntime().exec(cmd);
in = new DataInputStream( process.getInputStream() );
// use default charset from locale here, because the command invoked also uses the default locale:
- return IOUtils.toString(in);
+ return IOUtils.toString(new InputStreamReader(in, Charset.defaultCharset()));
}
catch( Exception ex ) {
// ignore - log.warn("Error executing command", ex);
@@ -208,7 +211,7 @@ public class SystemInfoHandler extends R
jvm.add( "processors", runtime.availableProcessors() );
// not thread safe, but could be thread local
- DecimalFormat df = new DecimalFormat("#.#");
+ DecimalFormat df = new DecimalFormat("#.#", DecimalFormatSymbols.getInstance(Locale.ROOT));
SimpleOrderedMap<Object> mem = new SimpleOrderedMap<Object>();
SimpleOrderedMap<Object> raw = new SimpleOrderedMap<Object>();
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java Mon Jul 9 17:04:57 2012
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
+import java.util.Locale;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
@@ -119,7 +120,7 @@ public class ThreadDumpHandler extends R
}
private static String formatNanos(long ns) {
- return String.format("%.4fms", ns / (double) 1000000);
+ return String.format(Locale.ROOT, "%.4fms", ns / (double) 1000000);
}
//////////////////////// SolrInfoMBeans methods //////////////////////
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java Mon Jul 9 17:04:57 2012
@@ -180,7 +180,7 @@ public class QueryComponent extends Sear
try {
responseFormat = Grouping.Format.valueOf(formatStr);
} catch (IllegalArgumentException e) {
- throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, String.format("Illegal %s parameter", GroupParams.GROUP_FORMAT));
+ throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, String.format(Locale.ROOT, "Illegal %s parameter", GroupParams.GROUP_FORMAT));
}
groupingSpec.setResponseFormat(responseFormat);
@@ -386,7 +386,7 @@ public class QueryComponent extends Sear
if (grouping.isSignalCacheWarning()) {
rsp.add(
"cacheWarning",
- String.format("Cache limit of %d percent relative to maxdoc has exceeded. Please increase cache size or disable caching.", maxDocsPercentageToCache)
+ String.format(Locale.ROOT, "Cache limit of %d percent relative to maxdoc has exceeded. Please increase cache size or disable caching.", maxDocsPercentageToCache)
);
}
rb.setResult(result);
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java Mon Jul 9 17:04:57 2012
@@ -242,7 +242,7 @@ public class TermsComponent extends Sear
int flags = 0;
for (String flagParam : flagParams) {
try {
- flags |= TermsParams.TermsRegexpFlag.valueOf(flagParam.toUpperCase(Locale.ENGLISH)).getValue();
+ flags |= TermsParams.TermsRegexpFlag.valueOf(flagParam.toUpperCase(Locale.ROOT)).getValue();
} catch (IllegalArgumentException iae) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Unknown terms regex flag '" + flagParam + "'");
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java Mon Jul 9 17:04:57 2012
@@ -40,22 +40,24 @@ public class BreakIteratorBoundaryScanne
Locale locale = null;
if(language != null){
locale = country == null ? new Locale(language) : new Locale(language, country);
+ } else {
+ locale = Locale.ROOT;
}
// construct BreakIterator
- String type = params.getFieldParam(fieldName, HighlightParams.BS_TYPE, "WORD").toLowerCase();
+ String type = params.getFieldParam(fieldName, HighlightParams.BS_TYPE, "WORD").toLowerCase(Locale.ROOT);
BreakIterator bi = null;
if(type.equals("character")){
- bi = locale == null ? BreakIterator.getCharacterInstance() : BreakIterator.getCharacterInstance(locale);
+ bi = BreakIterator.getCharacterInstance(locale);
}
else if(type.equals("word")){
- bi = locale == null ? BreakIterator.getWordInstance() : BreakIterator.getWordInstance(locale);
+ bi = BreakIterator.getWordInstance(locale);
}
else if(type.equals("line")){
- bi = locale == null ? BreakIterator.getLineInstance() : BreakIterator.getLineInstance(locale);
+ bi = BreakIterator.getLineInstance(locale);
}
else if(type.equals("sentence")){
- bi = locale == null ? BreakIterator.getSentenceInstance() : BreakIterator.getSentenceInstance(locale);
+ bi = BreakIterator.getSentenceInstance(locale);
}
else
throw new SolrException(ErrorCode.BAD_REQUEST, type + " is invalid for parameter " + HighlightParams.BS_TYPE);
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java Mon Jul 9 17:04:57 2012
@@ -106,16 +106,6 @@ public class CSVParser {
// ======================================================
/**
- * Default strategy for the parser follows the default {@link CSVStrategy}.
- *
- * @param input an InputStream containing "csv-formatted" stream
- * @deprecated use {@link #CSVParser(Reader)}.
- */
- public CSVParser(InputStream input) {
- this(new InputStreamReader(input));
- }
-
- /**
* CSV parser using the default {@link CSVStrategy}.
*
* @param input a Reader containing "csv-formatted" input
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java Mon Jul 9 17:04:57 2012
@@ -22,6 +22,8 @@ import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
+import org.apache.lucene.util.IOUtils;
+
/**
* Tries to guess a config based on an InputStream.
*
@@ -74,7 +76,7 @@ public class CSVConfigGuesser {
public CSVConfig guess() {
try {
// tralalal
- BufferedReader bIn = new BufferedReader(new InputStreamReader((getInputStream())));
+ BufferedReader bIn = new BufferedReader(new InputStreamReader(getInputStream(), IOUtils.CHARSET_UTF_8));
String[] lines = new String[10];
String line = null;
int counter = 0;
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/DateField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/DateField.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/DateField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/DateField.java Mon Jul 9 17:04:57 2012
@@ -127,7 +127,7 @@ public class DateField extends Primitive
* Fixed Locale needed for parsing/formating Milliseconds in the
* canonical representation.
*/
- protected static final Locale CANONICAL_LOCALE = Locale.US;
+ protected static final Locale CANONICAL_LOCALE = Locale.ROOT;
// The XML (external) date format will sort correctly, except if
// fractions of seconds are present (because '.' is lower than 'Z').
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/TrieField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/TrieField.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/TrieField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/TrieField.java Mon Jul 9 17:04:57 2012
@@ -96,7 +96,7 @@ public class TrieField extends Primitive
if (t != null) {
try {
- type = TrieTypes.valueOf(t.toUpperCase(Locale.ENGLISH));
+ type = TrieTypes.valueOf(t.toUpperCase(Locale.ROOT));
} catch (IllegalArgumentException e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
"Invalid type specified in schema.xml for field: " + args.get("name"), e);
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/UUIDField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/UUIDField.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/UUIDField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/UUIDField.java Mon Jul 9 17:04:57 2012
@@ -70,7 +70,7 @@ public class UUIDField extends StrField
@Override
public String toInternal(String val) {
if (val == null || 0==val.length() || NEW.equals(val)) {
- return UUID.randomUUID().toString().toLowerCase(Locale.ENGLISH);
+ return UUID.randomUUID().toString().toLowerCase(Locale.ROOT);
} else {
// we do some basic validation if 'val' looks like an UUID
if (val.length() != 36 || val.charAt(8) != DASH || val.charAt(13) != DASH
@@ -79,12 +79,12 @@ public class UUIDField extends StrField
"Invalid UUID String: '" + val + "'");
}
- return val.toLowerCase(Locale.ENGLISH);
+ return val.toLowerCase(Locale.ROOT);
}
}
public String toInternal(UUID uuid) {
- return uuid.toString().toLowerCase(Locale.ENGLISH);
+ return uuid.toString().toLowerCase(Locale.ROOT);
}
@Override
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/Grouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/Grouping.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/Grouping.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/Grouping.java Mon Jul 9 17:04:57 2012
@@ -376,7 +376,7 @@ public class Grouping {
cachedCollector.replay(secondPhaseCollectors);
} else {
signalCacheWarning = true;
- logger.warn(String.format("The grouping cache is active, but not used because it exceeded the max cache limit of %d percent", maxDocsPercentageToCache));
+ logger.warn(String.format(Locale.ROOT, "The grouping cache is active, but not used because it exceeded the max cache limit of %d percent", maxDocsPercentageToCache));
logger.warn("Please increase cache size or disable group caching.");
searchWithTimeLimiter(luceneFilter, secondPhaseCollectors);
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java Mon Jul 9 17:04:57 2012
@@ -39,6 +39,7 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.IOUtils;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.handler.RequestHandlerUtils;
@@ -224,7 +225,7 @@ public class FileFloatSource extends Val
return vals;
}
- BufferedReader r = new BufferedReader(new InputStreamReader(is));
+ BufferedReader r = new BufferedReader(new InputStreamReader(is, IOUtils.CHARSET_UTF_8));
String idName = ffs.keyField.getName();
FieldType idType = ffs.keyField.getType();
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java Mon Jul 9 17:04:57 2012
@@ -379,7 +379,7 @@ class StandardRequestParser implements S
public SolrParams parseParamsAndFillStreams(
final HttpServletRequest req, ArrayList<ContentStream> streams ) throws Exception
{
- String method = req.getMethod().toUpperCase(Locale.ENGLISH);
+ String method = req.getMethod().toUpperCase(Locale.ROOT);
if( "GET".equals( method ) || "HEAD".equals( method )) {
return new ServletSolrParams(req);
}
@@ -390,7 +390,7 @@ class StandardRequestParser implements S
if( idx > 0 ) { // remove the charset definition "; charset=utf-8"
contentType = contentType.substring( 0, idx );
}
- if( "application/x-www-form-urlencoded".equals( contentType.toLowerCase(Locale.ENGLISH) ) ) {
+ if( "application/x-www-form-urlencoded".equals( contentType.toLowerCase(Locale.ROOT) ) ) {
return new ServletSolrParams(req); // just get the params from parameterMap
}
if( ServletFileUpload.isMultipartContent(req) ) {
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java Mon Jul 9 17:04:57 2012
@@ -77,7 +77,7 @@ public final class HttpCacheHeaderUtil {
etagCache = "\""
+ new String(Base64.encodeBase64((Long.toHexString
(Long.reverse(indexVersionCache))
- + etagSeed).getBytes()), "US-ASCII")
+ + etagSeed).getBytes("US-ASCII")), "US-ASCII")
+ "\"";
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e); // may not happen
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/servlet/cache/Method.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/servlet/cache/Method.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/servlet/cache/Method.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/servlet/cache/Method.java Mon Jul 9 17:04:57 2012
@@ -24,7 +24,7 @@ public enum Method {
public static Method getMethod(String method) {
try {
- return Method.valueOf(method.toUpperCase(Locale.ENGLISH));
+ return Method.valueOf(method.toUpperCase(Locale.ROOT));
} catch (Exception e) {
return OTHER;
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/spelling/WordBreakSolrSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/spelling/WordBreakSolrSpellChecker.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/spelling/WordBreakSolrSpellChecker.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/spelling/WordBreakSolrSpellChecker.java Mon Jul 9 17:04:57 2012
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.regex.Pattern;
import org.apache.lucene.analysis.Token;
@@ -126,7 +127,7 @@ public class WordBreakSolrSpellChecker e
wbsp = new WordBreakSpellChecker();
String bstb = strParam(config, PARAM_BREAK_SUGGESTION_TIE_BREAKER);
if (bstb != null) {
- bstb = bstb.toUpperCase();
+ bstb = bstb.toUpperCase(Locale.ROOT);
if (bstb.equals(BreakSuggestionTieBreaker.SUM_FREQ.name())) {
sortMethod = BreakSuggestionSortMethod.NUM_CHANGES_THEN_SUMMED_FREQUENCY;
} else if (bstb.equals(BreakSuggestionTieBreaker.MAX_FREQ.name())) {
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java Mon Jul 9 17:04:57 2012
@@ -75,7 +75,7 @@ public class SolrIndexWriter extends Ind
File parent = f.getParentFile();
if (parent != null) parent.mkdirs();
FileOutputStream fos = new FileOutputStream(f, true);
- return new PrintStreamInfoStream(new PrintStream(fos, true));
+ return new PrintStreamInfoStream(new PrintStream(fos, true, "UTF-8"));
} else {
return InfoStream.NO_OUTPUT;
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/UpdateLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/UpdateLog.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/UpdateLog.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/UpdateLog.java Mon Jul 9 17:04:57 2012
@@ -756,7 +756,7 @@ public class UpdateLog implements Plugin
private void ensureLog() {
if (tlog == null) {
- String newLogName = String.format(Locale.ENGLISH, LOG_FILENAME_PATTERN, TLOG_NAME, id);
+ String newLogName = String.format(Locale.ROOT, LOG_FILENAME_PATTERN, TLOG_NAME, id);
tlog = new TransactionLog(new File(tlogDir, newLogName), globalStrings);
}
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/processor/URLClassifyProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/processor/URLClassifyProcessor.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/processor/URLClassifyProcessor.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/processor/URLClassifyProcessor.java Mon Jul 9 17:04:57 2012
@@ -21,6 +21,8 @@ import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.util.Locale;
+
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
@@ -213,7 +215,7 @@ public class URLClassifyProcessor extend
}
private String landingPageSuffix(URL url) {
- String path = url.getPath().toLowerCase();
+ String path = url.getPath().toLowerCase(Locale.ROOT);
for(String suffix : landingPageSuffixes) {
if(path.endsWith(suffix)) {
return suffix;
@@ -223,6 +225,6 @@ public class URLClassifyProcessor extend
}
private String getPathWithoutSuffix(URL url) {
- return url.getPath().toLowerCase().replaceFirst(landingPageSuffix(url)+"$", "");
+ return url.getPath().toLowerCase(Locale.ROOT).replaceFirst(landingPageSuffix(url)+"$", "");
}
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java Mon Jul 9 17:04:57 2012
@@ -59,7 +59,7 @@ public class UUIDUpdateProcessorFactory
UpdateRequestProcessor next ) {
return new DefaultValueUpdateProcessor(fieldName, next) {
public Object getDefaultValue() {
- return UUID.randomUUID().toString().toLowerCase(Locale.ENGLISH);
+ return UUID.randomUUID().toString().toLowerCase(Locale.ROOT);
}
};
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/util/DateMathParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/util/DateMathParser.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/util/DateMathParser.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/util/DateMathParser.java Mon Jul 9 17:04:57 2012
@@ -83,8 +83,8 @@ public class DateMathParser {
/** Default TimeZone for DateMath rounding (UTC) */
public static final TimeZone DEFAULT_MATH_TZ = UTC;
- /** Default Locale for DateMath rounding (Locale.US) */
- public static final Locale DEFAULT_MATH_LOCALE = Locale.US;
+ /** Default Locale for DateMath rounding (Locale.ROOT) */
+ public static final Locale DEFAULT_MATH_LOCALE = Locale.ROOT;
/**
* A mapping from (uppercased) String labels idenyifying time units,
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/util/NumberUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/util/NumberUtils.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/util/NumberUtils.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/util/NumberUtils.java Mon Jul 9 17:04:57 2012
@@ -18,6 +18,7 @@
package org.apache.solr.util;
import java.text.NumberFormat;
+import java.util.Locale;
import org.apache.lucene.util.BytesRef;
@@ -27,7 +28,7 @@ import org.apache.lucene.util.BytesRef;
public class NumberUtils {
public static String readableSize(long size) {
- NumberFormat formatter = NumberFormat.getNumberInstance();
+ NumberFormat formatter = NumberFormat.getNumberInstance(Locale.ROOT);
formatter.setMaximumFractionDigits(2);
if (size / (1024 * 1024 * 1024) > 0) {
return formatter.format(size * 1.0d / (1024 * 1024 * 1024)) + " GB";
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/TestTrie.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/TestTrie.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/TestTrie.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/TestTrie.java Mon Jul 9 17:04:57 2012
@@ -169,11 +169,11 @@ public class TestTrie extends SolrTestCa
assertQ("Range filter tint:[* to *] must match 10 documents", req("q", "*:*", "fq", "tdate:[* TO *]"), "//*[@numFound='10']");
// Test date math syntax
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ROOT);
format.setTimeZone(TimeZone.getTimeZone("UTC"));
assertU(delQ("*:*"));
- DateMathParser dmp = new DateMathParser(DateField.UTC, Locale.US);
+ DateMathParser dmp = new DateMathParser(DateField.UTC, Locale.ROOT);
String largestDate = "";
for (int i = 0; i < 10; i++) {
// index 10 days starting with today
@@ -220,9 +220,9 @@ public class TestTrie extends SolrTestCa
checkPrecisionSteps("tdate");
// For tdate tests
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ROOT);
format.setTimeZone(TimeZone.getTimeZone("UTC"));
- DateMathParser dmp = new DateMathParser(DateField.UTC, Locale.US);
+ DateMathParser dmp = new DateMathParser(DateField.UTC, Locale.ROOT);
for (int i = 0; i < 10; i++) {
long l = Integer.MAX_VALUE + i*1L;
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ZkTestServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ZkTestServer.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ZkTestServer.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ZkTestServer.java Mon Jul 9 17:04:57 2012
@@ -304,7 +304,7 @@ public class ZkTestServer {
reader =
new BufferedReader(
- new InputStreamReader(sock.getInputStream()));
+ new InputStreamReader(sock.getInputStream(), "US-ASCII"));
StringBuilder sb = new StringBuilder();
String line;
while((line = reader.readLine()) != null) {
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/core/TestConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/core/TestConfig.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/core/TestConfig.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/core/TestConfig.java Mon Jul 9 17:04:57 2012
@@ -109,7 +109,7 @@ public class TestConfig extends SolrTest
//System.out.println( handler.getHiddenFiles() );
// should not contain: <gettableFiles>solrconfig.xml scheam.xml admin-extra.html</gettableFiles>
- assertFalse(handler.getHiddenFiles().contains("scheam.xml".toUpperCase(Locale.ENGLISH)));
+ assertFalse(handler.getHiddenFiles().contains("scheam.xml".toUpperCase(Locale.ROOT)));
assertTrue(handler.getHiddenFiles().contains("PROTWORDS.TXT"));
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java Mon Jul 9 17:04:57 2012
@@ -19,14 +19,16 @@ package org.apache.solr.core;
import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPathExpressionException;
import org.apache.commons.io.FileUtils;
import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.util.IOUtils;
import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -172,7 +174,7 @@ public class TestCoreContainer extends S
assertTrue("Failed to mkdirs workDir", solrHomeDirectory.mkdirs());
try {
File solrXmlFile = new File(solrHomeDirectory, "solr.xml");
- BufferedWriter out = new BufferedWriter(new FileWriter(solrXmlFile));
+ BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(solrXmlFile), IOUtils.CHARSET_UTF_8));
out.write(EMPTY_SOLR_XML);
out.close();
} catch (IOException e) {
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java Mon Jul 9 17:04:57 2012
@@ -18,11 +18,13 @@ package org.apache.solr.handler;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.io.Writer;
import java.net.URL;
import java.util.regex.Matcher;
@@ -929,8 +931,8 @@ public class TestReplicationHandler exte
* character copy of file using UTF-8. If port is non-null, will be substituted any time "TEST_PORT" is found.
*/
private static void copyFile(File src, File dst, Integer port) throws IOException {
- BufferedReader in = new BufferedReader(new FileReader(src));
- Writer out = new FileWriter(dst);
+ BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(src), "UTF-8"));
+ Writer out = new OutputStreamWriter(new FileOutputStream(dst), "UTF-8");
for (String line = in.readLine(); null != line; line = in.readLine()) {
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java Mon Jul 9 17:04:57 2012
@@ -19,6 +19,7 @@ package org.apache.solr.handler.componen
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.IOUtils;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.MapSolrParams;
@@ -34,6 +35,7 @@ import org.junit.Test;
import java.io.File;
import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.util.HashMap;
import java.util.Map;
@@ -412,7 +414,7 @@ public class QueryElevationComponentTest
// write a test file to boost some docs
private void writeFile(File file, String query, String... ids) throws Exception {
- PrintWriter out = new PrintWriter(new FileOutputStream(file));
+ PrintWriter out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(file), IOUtils.CHARSET_UTF_8));
out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
out.println("<elevate>");
out.println("<query text=\"" + query + "\">");
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java Mon Jul 9 17:04:57 2012
@@ -174,7 +174,7 @@ public class StatsComponentTest extends
public void testFieldStatisticsResultsDateField() throws Exception {
SolrCore core = h.getCore();
- DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US);
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ROOT);
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
String date1 = dateFormat.format(new Date(123456789)) + "Z";
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVConfigGuesserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVConfigGuesserTest.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVConfigGuesserTest.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVConfigGuesserTest.java Mon Jul 9 17:04:57 2012
@@ -43,7 +43,7 @@ public class CSVConfigGuesserTest extend
* 1234 ; abcd ; 1234 ;
*
*/
- public void testConfigGuess1() {
+ public void testConfigGuess1() throws Exception {
CSVConfig expected = new CSVConfig();
expected.setDelimiter(';');
expected.setValueDelimiter(' ');
@@ -57,7 +57,7 @@ public class CSVConfigGuesserTest extend
StringBuffer sb = new StringBuffer();
sb.append("1234;abcd;1234\n");
sb.append("abcd;1234;abcd");
- ByteArrayInputStream in = new ByteArrayInputStream(sb.toString().getBytes());
+ ByteArrayInputStream in = new ByteArrayInputStream(sb.toString().getBytes("UTF-8"));
CSVConfigGuesser guesser = new CSVConfigGuesser(in);
CSVConfig guessed = guesser.guess();
assertEquals(expected.isFixedWidth(), guessed.isFixedWidth());
@@ -70,7 +70,7 @@ public class CSVConfigGuesserTest extend
* 1,2,3,4
*
*/
- public void testConfigGuess2() {
+ public void testConfigGuess2() throws Exception {
CSVConfig expected = new CSVConfig();
expected.setDelimiter(';');
expected.setValueDelimiter(' ');
@@ -80,7 +80,7 @@ public class CSVConfigGuesserTest extend
StringBuffer sb = new StringBuffer();
sb.append("1,2,3,4\n");
sb.append("abcd,1234,abcd,1234");
- ByteArrayInputStream in = new ByteArrayInputStream(sb.toString().getBytes());
+ ByteArrayInputStream in = new ByteArrayInputStream(sb.toString().getBytes("UTF-8"));
CSVConfigGuesser guesser = new CSVConfigGuesser(in);
CSVConfig guessed = guesser.guess();
assertEquals(expected.isFixedWidth(), guessed.isFixedWidth());
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java Mon Jul 9 17:04:57 2012
@@ -55,7 +55,7 @@ public class TestBinaryResponseWriter ex
* Tests known types implementation by asserting correct encoding/decoding of UUIDField
*/
public void testUUID() throws Exception {
- String s = UUID.randomUUID().toString().toLowerCase(Locale.ENGLISH);
+ String s = UUID.randomUUID().toString().toLowerCase(Locale.ROOT);
assertU(adoc("id", "101", "uuid", s));
assertU(commit());
LocalSolrQueryRequest req = lrf.makeRequest("q", "*:*");
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/request/TestFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/request/TestFaceting.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/request/TestFaceting.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/request/TestFaceting.java Mon Jul 9 17:04:57 2012
@@ -52,7 +52,7 @@ public class TestFaceting extends SolrTe
}
String t(int tnum) {
- return String.format(Locale.US, "%08d", tnum);
+ return String.format(Locale.ROOT, "%08d", tnum);
}
void createIndex(int nTerms) {
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java Mon Jul 9 17:04:57 2012
@@ -33,6 +33,7 @@ import org.junit.Test;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.net.URL;
@@ -83,7 +84,7 @@ public class TestRemoteStreaming extends
InputStream inputStream = (InputStream) obj;
try {
StringWriter strWriter = new StringWriter();
- IOUtils.copy(inputStream,strWriter);
+ IOUtils.copy(new InputStreamReader(inputStream, "UTF-8"),strWriter);
return strWriter.toString();
} finally {
IOUtils.closeQuietly(inputStream);
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java Mon Jul 9 17:04:57 2012
@@ -31,7 +31,7 @@ import java.util.Locale;
public class DateFieldTest extends LuceneTestCase {
public static TimeZone UTC = TimeZone.getTimeZone("UTC");
protected DateField f = null;
- protected DateMathParser p = new DateMathParser(UTC, Locale.US);
+ protected DateMathParser p = new DateMathParser(UTC, Locale.ROOT);
@Override
public void setUp() throws Exception {
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestLFUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestLFUCache.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestLFUCache.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestLFUCache.java Mon Jul 9 17:04:57 2012
@@ -26,6 +26,7 @@ import org.junit.Test;
import java.io.IOException;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
@@ -112,7 +113,7 @@ public class TestLFUCache extends SolrTe
private void assertCache(LFUCache cache, int... gets) {
for (int idx : gets) {
if (cache.get(idx) == null) {
- log.error(String.format("Expected entry %d not in cache", idx));
+ log.error(String.format(Locale.ROOT, "Expected entry %d not in cache", idx));
assertTrue(false);
}
}
@@ -120,7 +121,7 @@ public class TestLFUCache extends SolrTe
private void assertNotCache(LFUCache cache, int... gets) {
for (int idx : gets) {
if (cache.get(idx) != null) {
- log.error(String.format("Unexpected entry %d in cache", idx));
+ log.error(String.format(Locale.ROOT, "Unexpected entry %d in cache", idx));
assertTrue(false);
}
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestRecovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestRecovery.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestRecovery.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestRecovery.java Mon Jul 9 17:04:57 2012
@@ -906,7 +906,7 @@ public class TestRecovery extends SolrTe
// WARNING... assumes format of .00000n where n is less than 9
long logNumber = Long.parseLong(fname.substring(fname.lastIndexOf(".") + 1));
- String fname2 = String.format(Locale.ENGLISH,
+ String fname2 = String.format(Locale.ROOT,
UpdateLog.LOG_FILENAME_PATTERN,
UpdateLog.TLOG_NAME,
logNumber + 1);
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java Mon Jul 9 17:04:57 2012
@@ -50,7 +50,7 @@ public class TestSearchPerf extends Abst
}
String t(int tnum) {
- return String.format("%08d", tnum);
+ return String.format(Locale.ROOT, "%08d", tnum);
}
Random r = new Random(0); // specific seed for reproducible perf testing
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java Mon Jul 9 17:04:57 2012
@@ -55,17 +55,17 @@ public class DateMathParserTest extends
public DateMathParserTest() {
super();
fmt = new SimpleDateFormat
- ("G yyyyy MM ww WW DD dd F E aa HH hh mm ss SSS z Z",Locale.US);
+ ("G yyyyy MM ww WW DD dd F E aa HH hh mm ss SSS z Z",Locale.ROOT);
fmt.setTimeZone(UTC);
- parser = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS",Locale.US);
+ parser = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS",Locale.ROOT);
parser.setTimeZone(UTC);
}
/** MACRO: Round: parses s, rounds with u, fmts */
protected String r(String s, String u) throws Exception {
Date d = parser.parse(s);
- Calendar c = Calendar.getInstance(UTC, Locale.US);
+ Calendar c = Calendar.getInstance(UTC, Locale.ROOT);
c.setTime(d);
DateMathParser.round(c, u);
return fmt.format(c.getTime());
@@ -74,7 +74,7 @@ public class DateMathParserTest extends
/** MACRO: Add: parses s, adds v u, fmts */
protected String a(String s, int v, String u) throws Exception {
Date d = parser.parse(s);
- Calendar c = Calendar.getInstance(UTC, Locale.US);
+ Calendar c = Calendar.getInstance(UTC, Locale.ROOT);
c.setTime(d);
DateMathParser.add(c, v, u);
return fmt.format(c.getTime());
@@ -162,7 +162,7 @@ public class DateMathParserTest extends
public void testParseStatelessness() throws Exception {
- DateMathParser p = new DateMathParser(UTC, Locale.US);
+ DateMathParser p = new DateMathParser(UTC, Locale.ROOT);
p.setNow(parser.parse("2001-07-04T12:08:56.235"));
String e = fmt.format(p.parseMath(""));
@@ -179,7 +179,7 @@ public class DateMathParserTest extends
public void testParseMath() throws Exception {
- DateMathParser p = new DateMathParser(UTC, Locale.US);
+ DateMathParser p = new DateMathParser(UTC, Locale.ROOT);
p.setNow(parser.parse("2001-07-04T12:08:56.235"));
// No-Op
@@ -272,7 +272,7 @@ public class DateMathParserTest extends
// US, Positive Offset with DST
TimeZone tz = TimeZone.getTimeZone(PLUS_TZS);
- DateMathParser p = new DateMathParser(tz, Locale.US);
+ DateMathParser p = new DateMathParser(tz, Locale.ROOT);
p.setNow(parser.parse("2001-07-04T12:08:56.235"));
@@ -294,7 +294,7 @@ public class DateMathParserTest extends
// France, Negative Offset with DST
tz = TimeZone.getTimeZone(NEG_TZS);
- p = new DateMathParser(tz, Locale.US);
+ p = new DateMathParser(tz, Locale.ROOT);
p.setNow(parser.parse("2001-07-04T12:08:56.235"));
assertMath("2001-07-04T12:08:56.000", p, "/SECOND");
@@ -311,7 +311,7 @@ public class DateMathParserTest extends
public void testParseMathExceptions() throws Exception {
- DateMathParser p = new DateMathParser(UTC, Locale.US);
+ DateMathParser p = new DateMathParser(UTC, Locale.ROOT);
p.setNow(parser.parse("2001-07-04T12:08:56.235"));
Map<String,Integer> badCommands = new HashMap<String,Integer>();
Modified: lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java Mon Jul 9 17:04:57 2012
@@ -120,10 +120,10 @@ public class TimeZoneUtilsTest extends L
int hour = _TestUtil.nextInt(r, 0, 23);
int min = _TestUtil.nextInt(r, 0, 59);
- String hours = String.format(Locale.US,
+ String hours = String.format(Locale.ROOT,
(r.nextBoolean() ? ONE_DIGIT : TWO_DIGIT),
hour);
- String mins = String.format(Locale.US, TWO_DIGIT, min);
+ String mins = String.format(Locale.ROOT, TWO_DIGIT, min);
String input = "GMT" + (r.nextBoolean()?"+":"-")
+ hours + (r.nextBoolean() ? "" : ((r.nextBoolean()?":":"") + mins));
assertSameRules(input,
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java Mon Jul 9 17:04:57 2012
@@ -26,6 +26,7 @@ import org.apache.solr.common.params.Ter
import org.apache.solr.common.util.DateUtil;
import java.util.Date;
+import java.util.Locale;
import java.util.regex.Pattern;
@@ -240,9 +241,9 @@ public class SolrQuery extends Modifiabl
*/
public SolrQuery addNumericRangeFacet(String field, Number start, Number end, Number gap) {
add(FacetParams.FACET_RANGE, field);
- add(String.format("f.%s.%s", field, FacetParams.FACET_RANGE_START), start.toString());
- add(String.format("f.%s.%s", field, FacetParams.FACET_RANGE_END), end.toString());
- add(String.format("f.%s.%s", field, FacetParams.FACET_RANGE_GAP), gap.toString());
+ add(String.format(Locale.ROOT, "f.%s.%s", field, FacetParams.FACET_RANGE_START), start.toString());
+ add(String.format(Locale.ROOT, "f.%s.%s", field, FacetParams.FACET_RANGE_END), end.toString());
+ add(String.format(Locale.ROOT, "f.%s.%s", field, FacetParams.FACET_RANGE_GAP), gap.toString());
this.set(FacetParams.FACET, true);
return this;
}
@@ -258,9 +259,9 @@ public class SolrQuery extends Modifiabl
*/
public SolrQuery addDateRangeFacet(String field, Date start, Date end, String gap) {
add(FacetParams.FACET_RANGE, field);
- add(String.format("f.%s.%s", field, FacetParams.FACET_RANGE_START), DateUtil.getThreadLocalDateFormat().format(start));
- add(String.format("f.%s.%s", field, FacetParams.FACET_RANGE_END), DateUtil.getThreadLocalDateFormat().format(end));
- add(String.format("f.%s.%s", field, FacetParams.FACET_RANGE_GAP), gap);
+ add(String.format(Locale.ROOT, "f.%s.%s", field, FacetParams.FACET_RANGE_START), DateUtil.getThreadLocalDateFormat().format(start));
+ add(String.format(Locale.ROOT, "f.%s.%s", field, FacetParams.FACET_RANGE_END), DateUtil.getThreadLocalDateFormat().format(end));
+ add(String.format(Locale.ROOT, "f.%s.%s", field, FacetParams.FACET_RANGE_GAP), gap);
this.set(FacetParams.FACET, true);
return this;
}
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java Mon Jul 9 17:04:57 2012
@@ -178,7 +178,7 @@ public class DocumentObjectBinder {
} else {
String setterName = setter.getName();
if (setterName.startsWith("set") && setterName.length() > 3) {
- name = setterName.substring(3, 4).toLowerCase(Locale.ENGLISH) + setterName.substring(4);
+ name = setterName.substring(3, 4).toLowerCase(Locale.ROOT) + setterName.substring(4);
} else {
name = setter.getName();
}
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java Mon Jul 9 17:04:57 2012
@@ -20,6 +20,7 @@ package org.apache.solr.client.solrj.imp
import java.io.IOException;
import java.io.OutputStream;
import java.util.LinkedList;
+import java.util.Locale;
import java.util.Queue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch;
@@ -158,7 +159,7 @@ public class ConcurrentUpdateSolrServer
fmt = "<commit waitSearcher=\"%s\" waitFlush=\"%s\" />";
}
if (fmt != null) {
- byte[] content = String.format(
+ byte[] content = String.format(Locale.ROOT,
fmt,
params.getBool(UpdateParams.WAIT_SEARCHER, false)
+ "").getBytes("UTF-8");
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java Mon Jul 9 17:04:57 2012
@@ -190,7 +190,7 @@ public class XMLResponseParser extends R
{
if( v != null ) {
try {
- return KnownType.valueOf( v.toUpperCase(Locale.ENGLISH) );
+ return KnownType.valueOf( v.toUpperCase(Locale.ROOT) );
}
catch( Exception ex ) {}
}
@@ -270,7 +270,7 @@ public class XMLResponseParser extends R
if( XMLStreamConstants.START_ELEMENT != parser.getEventType() ) {
throw new RuntimeException( "must be start element, not: "+parser.getEventType() );
}
- if( !"arr".equals( parser.getLocalName().toLowerCase(Locale.ENGLISH) ) ) {
+ if( !"arr".equals( parser.getLocalName().toLowerCase(Locale.ROOT) ) ) {
throw new RuntimeException( "must be 'arr', not: "+parser.getLocalName() );
}
@@ -373,7 +373,7 @@ public class XMLResponseParser extends R
if( XMLStreamConstants.START_ELEMENT != parser.getEventType() ) {
throw new RuntimeException( "must be start element, not: "+parser.getEventType() );
}
- if( !"doc".equals( parser.getLocalName().toLowerCase(Locale.ENGLISH) ) ) {
+ if( !"doc".equals( parser.getLocalName().toLowerCase(Locale.ROOT) ) ) {
throw new RuntimeException( "must be 'lst', not: "+parser.getLocalName() );
}
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java Mon Jul 9 17:04:57 2012
@@ -34,7 +34,7 @@ public interface CollectionParams
{
if( p != null ) {
try {
- return CollectionAction.valueOf( p.toUpperCase(Locale.ENGLISH) );
+ return CollectionAction.valueOf( p.toUpperCase(Locale.ROOT) );
}
catch( Exception ex ) {}
}
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java Mon Jul 9 17:04:57 2012
@@ -154,7 +154,7 @@ public interface CommonParams {
public static EchoParamStyle get( String v ) {
if( v != null ) {
- v = v.toUpperCase(Locale.ENGLISH);
+ v = v.toUpperCase(Locale.ROOT);
if( v.equals( "EXPLICIT" ) ) {
return EXPLICIT;
}
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java Mon Jul 9 17:04:57 2012
@@ -99,7 +99,7 @@ public interface CoreAdminParams
{
if( p != null ) {
try {
- return CoreAdminAction.valueOf( p.toUpperCase(Locale.ENGLISH) );
+ return CoreAdminAction.valueOf( p.toUpperCase(Locale.ROOT) );
}
catch( Exception ex ) {}
}
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java Mon Jul 9 17:04:57 2012
@@ -264,10 +264,10 @@ public interface FacetParams {
public enum FacetRangeOther {
BEFORE, AFTER, BETWEEN, ALL, NONE;
@Override
- public String toString() { return super.toString().toLowerCase(); }
+ public String toString() { return super.toString().toLowerCase(Locale.ROOT); }
public static FacetRangeOther get(String label) {
try {
- return valueOf(label.toUpperCase());
+ return valueOf(label.toUpperCase(Locale.ROOT));
} catch (IllegalArgumentException e) {
throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST,
@@ -283,10 +283,10 @@ public interface FacetParams {
public enum FacetDateOther {
BEFORE, AFTER, BETWEEN, ALL, NONE;
@Override
- public String toString() { return super.toString().toLowerCase(); }
+ public String toString() { return super.toString().toLowerCase(Locale.ROOT); }
public static FacetDateOther get(String label) {
try {
- return valueOf(label.toUpperCase());
+ return valueOf(label.toUpperCase(Locale.ROOT));
} catch (IllegalArgumentException e) {
throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST,
@@ -317,10 +317,10 @@ public interface FacetParams {
public enum FacetRangeInclude {
ALL, LOWER, UPPER, EDGE, OUTER;
@Override
- public String toString() { return super.toString().toLowerCase(Locale.ENGLISH); }
+ public String toString() { return super.toString().toLowerCase(Locale.ROOT); }
public static FacetRangeInclude get(String label) {
try {
- return valueOf(label.toUpperCase(Locale.ENGLISH));
+ return valueOf(label.toUpperCase(Locale.ROOT));
} catch (IllegalArgumentException e) {
throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST,
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java Mon Jul 9 17:04:57 2012
@@ -59,7 +59,7 @@ public interface MoreLikeThisParams
public static TermStyle get( String p )
{
if( p != null ) {
- p = p.toUpperCase(Locale.ENGLISH);
+ p = p.toUpperCase(Locale.ROOT);
if( p.equals( "DETAILS" ) ) {
return DETAILS;
}
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java Mon Jul 9 17:04:57 2012
@@ -20,7 +20,6 @@ package org.apache.solr.common.util;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -30,6 +29,8 @@ import java.net.URL;
import java.net.URLConnection;
import java.util.Locale;
+import org.apache.lucene.util.IOUtils;
+
/**
* Three concrete implementations for ContentStream - one for File/URL/String
@@ -52,7 +53,7 @@ public abstract class ContentStreamBase
public static String getCharsetFromContentType( String contentType )
{
if( contentType != null ) {
- int idx = contentType.toLowerCase(Locale.ENGLISH).indexOf( "charset=" );
+ int idx = contentType.toLowerCase(Locale.ROOT).indexOf( "charset=" );
if( idx > 0 ) {
return contentType.substring( idx + "charset=".length() ).trim();
}
@@ -126,13 +127,13 @@ public abstract class ContentStreamBase
/**
* If an charset is defined (by the contentType) use that, otherwise
- * use a file reader
+ * use a UTF-8 reader
*/
@Override
public Reader getReader() throws IOException {
String charset = getCharsetFromContentType( contentType );
return charset == null
- ? new FileReader( file )
+ ? new InputStreamReader(getStream(), IOUtils.CHARSET_UTF_8)
: new InputStreamReader( getStream(), charset );
}
}
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/util/DateUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/util/DateUtil.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/util/DateUtil.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/util/DateUtil.java Mon Jul 9 17:04:57 2012
@@ -57,7 +57,7 @@ public class DateUtil {
private static final Date DEFAULT_TWO_DIGIT_YEAR_START;
static {
- Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.US);
+ Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.ROOT);
calendar.set(2000, Calendar.JANUARY, 1, 0, 0);
DEFAULT_TWO_DIGIT_YEAR_START = calendar.getTime();
}
@@ -147,7 +147,7 @@ public class DateUtil {
while (formatIter.hasNext()) {
String format = (String) formatIter.next();
if (dateParser == null) {
- dateParser = new SimpleDateFormat(format, Locale.US);
+ dateParser = new SimpleDateFormat(format, Locale.ROOT);
dateParser.setTimeZone(GMT);
dateParser.set2DigitYearStart(startDate);
} else {
@@ -184,7 +184,7 @@ public class DateUtil {
public ThreadLocalDateFormat() {
super();
//2007-04-26T08:05:04Z
- SimpleDateFormat tmp = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
+ SimpleDateFormat tmp = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.ROOT);
tmp.setTimeZone(UTC);
proto = tmp;
}
@@ -202,7 +202,7 @@ public class DateUtil {
// builder's buffer.
StringBuilder sb = out instanceof StringBuilder ? (StringBuilder)out : new StringBuilder();
- if (cal==null) cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.US);
+ if (cal==null) cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.ROOT);
cal.setTime(date);
int i = cal.get(Calendar.YEAR);
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java Mon Jul 9 17:04:57 2012
@@ -209,7 +209,7 @@ public class StrUtils {
public static List<String> toLower(List<String> strings) {
ArrayList<String> ret = new ArrayList<String>(strings.size());
for (String str : strings) {
- ret.add(str.toLowerCase(Locale.ENGLISH));
+ ret.add(str.toLowerCase(Locale.ROOT));
}
return ret;
}
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java Mon Jul 9 17:04:57 2012
@@ -26,6 +26,7 @@ import org.apache.solr.common.util.DateU
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
+import java.util.TimeZone;
/**
*
@@ -139,7 +140,7 @@ public class SolrQueryTest extends Lucen
public void testFacetDateRange() {
SolrQuery q = new SolrQuery("dog");
- Calendar calendar = Calendar.getInstance(Locale.UK);
+ Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.UK);
calendar.set(2010, 1, 1);
Date start = calendar.getTime();
calendar.set(2011, 1, 1);
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java Mon Jul 9 17:04:57 2012
@@ -19,6 +19,7 @@ package org.apache.solr.client.solrj.emb
import java.io.File;
import java.io.FileInputStream;
+import java.io.InputStreamReader;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -169,7 +170,7 @@ public class TestSolrProperties extends
Document document = builder.parse(fis);
fis.close();
fis = new FileInputStream(new File(tempDir, SOLR_PERSIST_XML));
- String solrPersistXml = IOUtils.toString(fis);
+ String solrPersistXml = IOUtils.toString(new InputStreamReader(fis, "UTF-8"));
//System.out.println("xml:" + solrPersistXml);
assertTrue("\"/solr/cores[@defaultCoreName='core0']\" doesn't match in:\n" + solrPersistXml,
exists("/solr/cores[@defaultCoreName='core0']", document));
Modified: lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java?rev=1359283&r1=1359282&r2=1359283&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java (original)
+++ lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java Mon Jul 9 17:04:57 2012
@@ -21,9 +21,9 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.StringReader;
import java.net.ConnectException;
import java.net.HttpURLConnection;
@@ -60,7 +60,7 @@ public class ContentStreamTest extends L
ContentStreamBase stream = new ContentStreamBase.FileStream( file );
assertEquals( file.length(), stream.getSize().intValue() );
assertTrue( IOUtils.contentEquals( new FileInputStream( file ), stream.getStream() ) );
- assertTrue( IOUtils.contentEquals( new FileReader( file ), stream.getReader() ) );
+ assertTrue( IOUtils.contentEquals( new InputStreamReader(new FileInputStream(file), "UTF-8"), stream.getReader() ) );
}