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 2013/12/24 16:34:52 UTC
svn commit: r1553289 - in /lucene/dev/branches/lucene5376/lucene/server/src:
java/org/apache/lucene/server/ java/org/apache/lucene/server/http/
test/org/apache/lucene/server/
Author: rmuir
Date: Tue Dec 24 15:34:51 2013
New Revision: 1553289
URL: http://svn.apache.org/r1553289
Log:
LUCENE-5376: clean up some forbidden apis
Modified:
lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/GlobalState.java
lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/Server.java
lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/http/HttpStaticFileServerHandler.java
lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSearch.java
lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSuggest.java
Modified: lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/GlobalState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/GlobalState.java?rev=1553289&r1=1553288&r2=1553289&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/GlobalState.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/GlobalState.java Tue Dec 24 15:34:51 2013
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.RandomAccessFile;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@@ -313,7 +314,7 @@ public class GlobalState implements Clos
Properties pluginProps = new Properties();
InputStream is = pluginURL.openStream();
try {
- pluginProps.load(is);
+ pluginProps.load(new InputStreamReader(is, "UTF-8"));
} catch (Exception e) {
throw new IllegalStateException("property file \"" + pluginURL + "\" could not be loaded", e);
} finally {
Modified: lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/Server.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/Server.java?rev=1553289&r1=1553288&r2=1553289&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/Server.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/Server.java Tue Dec 24 15:34:51 2013
@@ -29,6 +29,7 @@ import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
@@ -265,7 +266,7 @@ public class Server {
// nocommit do we need to check this per-chunk?
String s = request.getHeader("Connection");
- if (s != null && s.toLowerCase().equals(HttpHeaders.Values.CLOSE)) {
+ if (s != null && s.toLowerCase(Locale.ROOT).equals(HttpHeaders.Values.CLOSE)) {
doKeepAlive = false;
}
Modified: lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/http/HttpStaticFileServerHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/http/HttpStaticFileServerHandler.java?rev=1553289&r1=1553288&r2=1553289&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/http/HttpStaticFileServerHandler.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/http/HttpStaticFileServerHandler.java Tue Dec 24 15:34:51 2013
@@ -275,9 +275,10 @@ public class HttpStaticFileServerHandler
*/
private static void setDateHeader(HttpResponse response) {
SimpleDateFormat dateFormatter = new SimpleDateFormat(HTTP_DATE_FORMAT, Locale.US);
- dateFormatter.setTimeZone(TimeZone.getTimeZone(HTTP_DATE_GMT_TIMEZONE));
+ TimeZone tz = TimeZone.getTimeZone(HTTP_DATE_GMT_TIMEZONE);
+ dateFormatter.setTimeZone(tz);
- Calendar time = new GregorianCalendar();
+ Calendar time = new GregorianCalendar(tz, Locale.US);
response.setHeader(DATE, dateFormatter.format(time.getTime()));
}
@@ -291,10 +292,11 @@ public class HttpStaticFileServerHandler
*/
private static void setDateAndCacheHeaders(HttpResponse response, File fileToCache) {
SimpleDateFormat dateFormatter = new SimpleDateFormat(HTTP_DATE_FORMAT, Locale.US);
- dateFormatter.setTimeZone(TimeZone.getTimeZone(HTTP_DATE_GMT_TIMEZONE));
+ TimeZone tz = TimeZone.getTimeZone(HTTP_DATE_GMT_TIMEZONE);
+ dateFormatter.setTimeZone(tz);
// Date header
- Calendar time = new GregorianCalendar();
+ Calendar time = new GregorianCalendar(tz, Locale.US);
response.setHeader(DATE, dateFormatter.format(time.getTime()));
// Add cache headers
Modified: lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSearch.java?rev=1553289&r1=1553288&r2=1553289&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSearch.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSearch.java Tue Dec 24 15:34:51 2013
@@ -165,7 +165,7 @@ public class TestSearch extends ServerBa
for(String type : new String[] {"int", "long", "float", "double"}) {
send("createIndex", "{indexName: nrq, rootDir: nrq}");
send("startIndex", "{indexName: nrq}");
- send("registerFields", String.format("{indexName: nrq, fields: {nf: {type: %s, index: true}}}", type));
+ send("registerFields", String.format(Locale.ROOT, "{indexName: nrq, fields: {nf: {type: %s, index: true}}}", type));
send("addDocument", "{indexName: nrq, fields: {nf: 5}}");
send("addDocument", "{indexName: nrq, fields: {nf: 10}}");
long gen = getLong(send("addDocument", "{indexName: nrq, fields: {nf: 17}}"), "indexGen");
Modified: lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSuggest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSuggest.java?rev=1553289&r1=1553288&r2=1553289&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSuggest.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestSuggest.java Tue Dec 24 15:34:51 2013
@@ -19,7 +19,9 @@ package org.apache.lucene.server;
import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import org.apache.lucene.util._TestUtil;
import org.junit.AfterClass;
@@ -51,7 +53,7 @@ public class TestSuggest extends ServerB
}
public void testAnalyzingSuggest() throws Exception {
- FileWriter fstream = new FileWriter(tempFile);
+ Writer fstream = new OutputStreamWriter(new FileOutputStream(tempFile), "UTF-8");
BufferedWriter out = new BufferedWriter(fstream);
out.write("5\u001flucene\u001ffoobar\n");
out.write("10\u001flucifer\u001ffoobar\n");
@@ -101,7 +103,7 @@ public class TestSuggest extends ServerB
}
public void testInfixSuggest() throws Exception {
- FileWriter fstream = new FileWriter(tempFile);
+ Writer fstream = new OutputStreamWriter(new FileOutputStream(tempFile), "UTF-8");
BufferedWriter out = new BufferedWriter(fstream);
out.write("15\u001flove lost\u001ffoobar\n");
out.close();
@@ -139,7 +141,7 @@ public class TestSuggest extends ServerB
}
public void testFuzzySuggest() throws Exception {
- FileWriter fstream = new FileWriter(tempFile);
+ Writer fstream = new OutputStreamWriter(new FileOutputStream(tempFile), "UTF-8");
BufferedWriter out = new BufferedWriter(fstream);
out.write("15\u001flove lost\u001ffoobar\n");
out.close();