adds LOCALE.English to each toLowerCase call to avoid the famous Turk…

…ish problem refs: orientechnologies/orientdb#7464
orientechnologies · Jun 26, 2017 · bc97be0 · bc97be0
1 parent 6985126
commit bc97be0
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/src/main/java/com/orientechnologies/teleporter/mapper/rdbms/OER2GraphMapper.java b/src/main/java/com/orientechnologies/teleporter/mapper/rdbms/OER2GraphMapper.java
@@ -577,7 +577,7 @@ private List<LinkedHashMap<String, String>> fromResultSetToList(ResultSet result
 
           LinkedHashMap<String, String> row = new LinkedHashMap<String, String>();
           for (int i = 1; i <= columnsAmount; i++) {
-            row.put(resultForeignKeys.getMetaData().getColumnName(i).toLowerCase(), resultForeignKeys.getString(i));
+            row.put(resultForeignKeys.getMetaData().getColumnName(i).toLowerCase(Locale.ENGLISH), resultForeignKeys.getString(i));
           }
           rows.add(row);
         }

diff --git a/src/main/java/com/orientechnologies/teleporter/nameresolver/OJavaConventionNameResolver.java b/src/main/java/com/orientechnologies/teleporter/nameresolver/OJavaConventionNameResolver.java
@@ -20,6 +20,8 @@
 
 import com.orientechnologies.teleporter.model.dbschema.OCanonicalRelationship;
 
+import java.util.Locale;
+
 /**
  * Implementation of ONameResolver that performs name transformations on the elements
  * of the data source according to the Java convention.
@@ -106,14 +108,14 @@ public String toJavaClassConvention(String name) {
     }
 
     if (allUpperCase) {
-      name = name.toLowerCase();
+      name = name.toLowerCase(Locale.ENGLISH);
     }
 
     if (name.contains(" ")) {
       int pos;
       while (name.contains(" ")) {
         pos = name.indexOf(" ");
-        name = name.substring(0, pos) + (name.charAt(pos + 1) + "").toUpperCase() + name.substring(pos + 2);
+        name = name.substring(0, pos) + (name.charAt(pos + 1) + "").toUpperCase(Locale.ENGLISH) + name.substring(pos + 2);
       }
     }
 
@@ -123,7 +125,7 @@ public String toJavaClassConvention(String name) {
         pos = name.indexOf("_");
         if(pos < name.length()-1) {
           // the '_' char is not in last position
-          name = name.substring(0, pos) + (name.charAt(pos + 1) + "").toUpperCase() + name.substring(pos + 2);
+          name = name.substring(0, pos) + (name.charAt(pos + 1) + "").toUpperCase(Locale.ENGLISH) + name.substring(pos + 2);
         }
         else {
           // the '_' char is in last position
@@ -136,13 +138,13 @@ public String toJavaClassConvention(String name) {
       int pos;
       while (name.contains("-")) {
         pos = name.indexOf("-");
-        name = name.substring(0, pos) + (name.charAt(pos + 1) + "").toUpperCase() + name.substring(pos + 2);
+        name = name.substring(0, pos) + (name.charAt(pos + 1) + "").toUpperCase(Locale.ENGLISH) + name.substring(pos + 2);
       }
     }
 
     // First char must be uppercase
     if (Character.isLowerCase(name.charAt(0)))
-      name = name.substring(0, 1).toUpperCase() + name.substring(1);
+      name = name.substring(0, 1).toUpperCase(Locale.ENGLISH) + name.substring(1);
 
     return name;
 
@@ -161,36 +163,36 @@ public String toJavaVariableConvention(String name) {
     }
 
     if (allUpperCase) {
-      name = name.toLowerCase();
+      name = name.toLowerCase(Locale.ENGLISH);
     }
 
     if (name.contains(" ")) {
       int pos;
       while (name.contains(" ")) {
         pos = name.indexOf(" ");
-        name = name.substring(0, pos) + (name.charAt(pos + 1) + "").toUpperCase() + name.substring(pos + 2);
+        name = name.substring(0, pos) + (name.charAt(pos + 1) + "").toUpperCase(Locale.ENGLISH) + name.substring(pos + 2);
       }
     }
 
     if (name.contains("_")) {
       int pos;
       while (name.contains("_")) {
         pos = name.indexOf("_");
-        name = name.substring(0, pos) + (name.charAt(pos + 1) + "").toUpperCase() + name.substring(pos + 2);
+        name = name.substring(0, pos) + (name.charAt(pos + 1) + "").toUpperCase(Locale.ENGLISH) + name.substring(pos + 2);
       }
     }
 
     if (name.contains("-")) {
       int pos;
       while (name.contains("-")) {
         pos = name.indexOf("-");
-        name = name.substring(0, pos) + (name.charAt(pos + 1) + "").toUpperCase() + name.substring(pos + 2);
+        name = name.substring(0, pos) + (name.charAt(pos + 1) + "").toUpperCase(Locale.ENGLISH) + name.substring(pos + 2);
       }
     }
 
     // First char must be lowercase
     if (Character.isUpperCase(name.charAt(0)))
-      name = name.substring(0, 1).toLowerCase() + name.substring(1);
+      name = name.substring(0, 1).toLowerCase(Locale.ENGLISH) + name.substring(1);
 
     return name;
   }

diff --git a/src/main/java/com/orientechnologies/teleporter/persistence/handler/ODBMSDataTypeHandler.java b/src/main/java/com/orientechnologies/teleporter/persistence/handler/ODBMSDataTypeHandler.java
@@ -19,6 +19,7 @@
 package com.orientechnologies.teleporter.persistence.handler;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import com.orientechnologies.teleporter.context.OTeleporterContext;
@@ -52,7 +53,7 @@ public ODBMSDataTypeHandler() {
   public OType resolveType(String type) {
 
     // normalization
-    type = type.toLowerCase();
+    type = type.toLowerCase(Locale.ENGLISH);
 
     // Defined Types
     if (this.dbmsType2OrientType.keySet().contains(type))

diff --git a/src/main/java/com/orientechnologies/teleporter/util/ODriverConfigurator.java b/src/main/java/com/orientechnologies/teleporter/util/ODriverConfigurator.java
@@ -31,10 +31,7 @@
 import java.nio.charset.Charset;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Executes an automatic migrationConfigDoc of the chosen driver JDBC.
@@ -100,7 +97,7 @@ private void fillMap() {
   public String fetchDriverClassName(String driverName) {
 
     String driverClassName = null;
-    driverName = driverName.toLowerCase();
+    driverName = driverName.toLowerCase(Locale.ENGLISH);
 
     try {
 
@@ -155,7 +152,7 @@ public void checkDriverConfiguration(String driverName) {
 
   public void checkDriverConfiguration(String driverName, String driverClassPath) {
 
-    driverName = driverName.toLowerCase();
+    driverName = driverName.toLowerCase(Locale.ENGLISH);
 
     try {
 

diff --git a/src/main/java/com/orientechnologies/teleporter/writer/OGraphModelWriter.java b/src/main/java/com/orientechnologies/teleporter/writer/OGraphModelWriter.java
@@ -632,7 +632,7 @@ else if (currentVertexType.getParentType() != null && !orientCorrespondentVertex
   }
 
   public OType resolveOrientDBType(String orientdbTypeName) {
-    orientdbTypeName = orientdbTypeName.toLowerCase();
+    orientdbTypeName = orientdbTypeName.toLowerCase(Locale.ENGLISH);
     return this.orientdbTypeName2orientdbType.get(orientdbTypeName);
   }