Author: thomasm
Date: Wed Jul 3 13:03:08 2019
New Revision: 1862464
URL: http://svn.apache.org/viewvc?rev=1862464&view=rev
Log:
OAK-260 Avoid the Turkish Locale Problem
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/PersistentCacheCommand.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/FulltextIndexConstants.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java?rev=1862464&r1=1862463&r2=1862464&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
Wed Jul 3 13:03:08 2019
@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -1388,7 +1389,7 @@ public class QueryImpl implements Query
private static String recomposeStatement(@NotNull QueryImpl query) {
checkNotNull(query);
String original = query.getStatement();
- String origUpper = original.toUpperCase();
+ String origUpper = original.toUpperCase(Locale.ENGLISH);
StringBuilder recomputed = new StringBuilder();
final String where = " WHERE ";
final String orderBy = " ORDER BY ";
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/PersistentCacheCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/PersistentCacheCommand.java?rev=1862464&r1=1862463&r2=1862464&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/PersistentCacheCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/PersistentCacheCommand.java
Wed Jul 3 13:03:08 2019
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.FileWriter;
import java.io.PrintWriter;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
@@ -135,7 +136,7 @@ public class PersistentCacheCommand impl
}
static void statistics(PrintWriter write, MVMap<String, String> m) {
- write.println("map: " + m.getName().toLowerCase());
+ write.println("map: " + m.getName().toLowerCase(Locale.ENGLISH));
write.println("entryCount: " + m.sizeAsLong());
long keyLen = 0, valueLen = 0;
for (Entry<String, String> e : m.entrySet()) {
@@ -150,7 +151,7 @@ public class PersistentCacheCommand impl
}
static void dumpRaw(PrintWriter write, MVMap<String, String> m) {
- String mapName = m.getName().toLowerCase();
+ String mapName = m.getName().toLowerCase(Locale.ENGLISH);
// map key value length
for (Entry<String, String> e : m.entrySet()) {
String key = e.getKey();
@@ -161,7 +162,7 @@ public class PersistentCacheCommand impl
static void dump(PrintWriter write, MVMap<String, String> m, String path,
String revision, boolean values) {
- String mapName = m.getName().toLowerCase();
+ String mapName = m.getName().toLowerCase(Locale.ENGLISH);
// map,path,revision,p2,value,length
for (Entry<String, String> e : m.entrySet()) {
String key = e.getKey();
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/FulltextIndexConstants.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/FulltextIndexConstants.java?rev=1862464&r1=1862463&r2=1862464&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/FulltextIndexConstants.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/FulltextIndexConstants.java
Wed Jul 3 13:03:08 2019
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.index.search;
+import java.util.Locale;
+
/**
* Internal constants used in index definition, and index implementations.
*/
@@ -25,11 +27,11 @@ public interface FulltextIndexConstants
SYNC, NRT, ASYNC;
public String asyncValueName() {
- return name().toLowerCase();
+ return name().toLowerCase(Locale.ENGLISH);
}
public static IndexingMode from(String indexingMode) {
- return valueOf(indexingMode.toUpperCase());
+ return valueOf(indexingMode.toUpperCase(Locale.ENGLISH));
}
}
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java?rev=1862464&r1=1862463&r2=1862464&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java
Wed Jul 3 13:03:08 2019
@@ -1579,10 +1579,10 @@ public class IndexDefinition implements
return pse != null ? ImmutableSet.copyOf(pse.getValue(Type.STRINGS)) :
Collections.<String>emptySet();
}
- private static Set<String> toLowerCase(Set<String> values){
+ private static Set<String> toLowerCase(Set<String> values) {
Set<String> result = newHashSet();
for(String val : values){
- result.add(val.toLowerCase());
+ result.add(val.toLowerCase(Locale.ENGLISH));
}
return ImmutableSet.copyOf(result);
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java?rev=1862464&r1=1862463&r2=1862464&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
Wed Jul 3 13:03:08 2019
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
+import java.util.Locale;
import com.google.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
@@ -123,7 +124,7 @@ public class OakSolrNodeStateConfigurati
@NotNull
@Override
public CommitPolicy getCommitPolicy() {
- return
CommitPolicy.valueOf(getStringValueFor(Properties.COMMIT_POLICY,
CommitPolicy.SOFT.toString()).toUpperCase());
+ return
CommitPolicy.valueOf(getStringValueFor(Properties.COMMIT_POLICY,
CommitPolicy.SOFT.toString()).toUpperCase(Locale.ENGLISH));
}
@Override
