IGNITE-14823 Package abbrevation (#11150)

apache · Dec 27, 2023 · 7081017 · 7081017
1 parent a0fc658
commit 7081017
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...rc/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJson.java b/...rc/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJson.java
@@ -137,8 +137,8 @@ private static RelFactory relFactory(String typeName) {
         Class<?> clazz = null;
 
         if (!typeName.contains(".")) {
-            for (String package_ : PACKAGES) {
-                if ((clazz = classForName(package_ + typeName, true)) != null)
+            for (String pkg_ : PACKAGES) {
+                if ((clazz = classForName(pkg_ + typeName, true)) != null)
                     break;
             }
         }
@@ -250,9 +250,9 @@ String classToTypeName(Class<? extends RelNode> class_) {
             return class_.getSimpleName();
 
         String canonicalName = class_.getName();
-        for (String package_ : PACKAGES) {
-            if (canonicalName.startsWith(package_)) {
-                String remaining = canonicalName.substring(package_.length());
+        for (String pkg_ : PACKAGES) {
+            if (canonicalName.startsWith(pkg_)) {
+                String remaining = canonicalName.substring(pkg_.length());
                 if (remaining.indexOf('.') < 0 && remaining.indexOf('$') < 0)
                     return remaining;
             }

diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -44,7 +44,7 @@ messages,msgs
 mutex,mux
 network,net
 object,obj
-#package,pkg
+package,pkg
 #parameter,param
 #password,pwd
 #policy,plc