This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 1ed6d185b72 IGNITE-14823 Class abbrevation (#11092)
1ed6d185b72 is described below
commit 1ed6d185b726ce5a85fe420b16df74e46cbf5f9a
Author: Nikolay <nizhi...@apache.org>
AuthorDate: Wed Dec 13 15:08:24 2023 +0300
IGNITE-14823 Class abbrevation (#11092)
---
.../query/calcite/exec/exp/RexImpTable.java | 4 +-
.../query/calcite/exec/exp/RexToLixTranslator.java | 32 ++++++-------
.../query/calcite/externalize/RelJson.java | 10 ++--
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../SystemViewRowAttributeWalkerGenerator.java | 6 +--
.../deployment/GridDeploymentClassLoader.java | 14 +++---
.../preloader/GridDhtPartitionsFullMessage.java | 6 +--
.../apache/ignite/ClassPathContentLoggingTest.java | 4 +-
.../internal/MarshallerContextLockingSelfTest.java | 6 +--
.../internal/binary/BinaryMarshallerSelfTest.java | 6 +--
.../internal/binary/BinaryObjectToStringTest.java | 56 +++++++++++-----------
.../IgniteCacheAbstractExecutionContextTest.java | 6 +--
.../ignite/internal/util/IgniteUtilsSelfTest.java | 4 +-
.../util/tostring/GridToStringBuilderSelfTest.java | 8 ++--
.../marshaller/MarshallerContextSelfTest.java | 12 ++---
.../p2p/DeploymentClassLoaderCallableTest.java | 12 ++---
.../testframework/junits/GridAbstractTest.java | 6 +--
.../classloadproblem/P2PClassLoadingProblems.java | 4 +-
.../cache/index/AbstractSchemaSelfTest.java | 4 +-
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 8 ++--
20 files changed, 105 insertions(+), 105 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
index f90c6c34425..0bf4221a58a 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
@@ -2025,12 +2025,12 @@ public class RexImpTable {
return argValueList;
}
assert (nullCount > 0) == type.isNullable();
- final Type javaClass =
+ final Type javaCls =
translator.typeFactory.getJavaClass(type);
final List<Expression> harmonizedArgValues = new ArrayList<>();
for (Expression argValue : argValueList) {
harmonizedArgValues.add(
- EnumUtils.convert(argValue, javaClass));
+ EnumUtils.convert(argValue, javaCls));
}
return harmonizedArgValues;
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
index aeef8e8a4bb..8cba1b67875 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
@@ -683,16 +683,16 @@ public class RexToLixTranslator implements
RexVisitor<RexToLixTranslator.Result>
return RexImpTable.FALSE_EXPR;
}
}
- Type javaClass = typeFactory.getJavaClass(type);
+ Type javaCls = typeFactory.getJavaClass(type);
final Object value2;
switch (literal.getType().getSqlTypeName()) {
case DECIMAL:
final BigDecimal bd = literal.getValueAs(BigDecimal.class);
- if (javaClass == float.class)
- return Expressions.constant(bd, javaClass);
- else if (javaClass == double.class)
- return Expressions.constant(bd, javaClass);
- assert javaClass == BigDecimal.class;
+ if (javaCls == float.class)
+ return Expressions.constant(bd, javaCls);
+ else if (javaCls == double.class)
+ return Expressions.constant(bd, javaCls);
+ assert javaCls == BigDecimal.class;
return Expressions.call(
IgniteSqlFunctions.class,
"toBigDecimal",
@@ -711,7 +711,7 @@ public class RexToLixTranslator implements
RexVisitor<RexToLixTranslator.Result>
case INTERVAL_YEAR_MONTH:
case INTERVAL_MONTH:
value2 = literal.getValueAs(Integer.class);
- javaClass = int.class;
+ javaCls = int.class;
break;
case TIMESTAMP:
case TIMESTAMP_WITH_LOCAL_TIME_ZONE:
@@ -726,7 +726,7 @@ public class RexToLixTranslator implements
RexVisitor<RexToLixTranslator.Result>
case INTERVAL_MINUTE_SECOND:
case INTERVAL_SECOND:
value2 = literal.getValueAs(Long.class);
- javaClass = long.class;
+ javaCls = long.class;
break;
case CHAR:
case VARCHAR:
@@ -743,15 +743,15 @@ public class RexToLixTranslator implements
RexVisitor<RexToLixTranslator.Result>
throw new IllegalStateException("Unsupported data type: " +
literal.getType());
case SYMBOL:
value2 = literal.getValueAs(Enum.class);
- javaClass = value2.getClass();
+ javaCls = value2.getClass();
break;
default:
- final Primitive primitive = Primitive.ofBoxOr(javaClass);
+ final Primitive primitive = Primitive.ofBoxOr(javaCls);
final Comparable value = literal.getValueAs(Comparable.class);
value2 = primitive != null && value instanceof Number ?
primitive.number((Number)value) : value;
}
- return Expressions.constant(value2, javaClass);
+ return Expressions.constant(value2, javaCls);
}
/** */
@@ -975,7 +975,7 @@ public class RexToLixTranslator implements
RexVisitor<RexToLixTranslator.Result>
*/
private ConstantExpression getTypedNullLiteral(RexLiteral literal) {
assert literal.isNull();
- Type javaClass = typeFactory.getJavaClass(literal.getType());
+ Type javaCls = typeFactory.getJavaClass(literal.getType());
switch (literal.getType().getSqlTypeName()) {
case DATE:
case TIME:
@@ -983,7 +983,7 @@ public class RexToLixTranslator implements
RexVisitor<RexToLixTranslator.Result>
case INTERVAL_YEAR:
case INTERVAL_YEAR_MONTH:
case INTERVAL_MONTH:
- javaClass = Integer.class;
+ javaCls = Integer.class;
break;
case TIMESTAMP:
case TIMESTAMP_WITH_LOCAL_TIME_ZONE:
@@ -997,12 +997,12 @@ public class RexToLixTranslator implements
RexVisitor<RexToLixTranslator.Result>
case INTERVAL_MINUTE:
case INTERVAL_MINUTE_SECOND:
case INTERVAL_SECOND:
- javaClass = Long.class;
+ javaCls = Long.class;
break;
}
- return javaClass == null || javaClass == Void.class
+ return javaCls == null || javaCls == Void.class
? RexImpTable.NULL_EXPR
- : Expressions.constant(null, javaClass);
+ : Expressions.constant(null, javaCls);
}
/**
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJson.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJson.java
index bfb14e02b88..f7fdcd3ae61 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJson.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJson.java
@@ -576,9 +576,9 @@ class RelJson {
for (SqlOperator operator : operators)
if (operator.kind == sqlKind)
return operator;
- String class_ = (String)map.get("class");
- if (class_ != null)
- return AvaticaUtils.instantiatePlugin(SqlOperator.class, class_);
+ String cls_ = (String)map.get("class");
+ if (cls_ != null)
+ return AvaticaUtils.instantiatePlugin(SqlOperator.class, cls_);
return null;
}
@@ -601,9 +601,9 @@ class RelJson {
<T extends Enum<T>> T toEnum(Object o) {
if (o instanceof Map) {
Map<String, Object> map = (Map<String, Object>)o;
- String class_ = (String)map.get("class");
+ String cls_ = (String)map.get("class");
String name = map.get("name").toString();
- return Util.enumVal((Class<T>)classForName(class_, false), name);
+ return Util.enumVal((Class<T>)classForName(cls_, false), name);
}
assert o instanceof String && ENUM_BY_NAME.containsKey(o);
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 555fbba9f78..e7d99cb554f 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -8,7 +8,7 @@ array,arr
attribute,attr
attributes,attrs
buffer,buf
-#class,cls
+class,cls
#command,cmd
#config,cfg
#context,ctx
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/codegen/SystemViewRowAttributeWalkerGenerator.java
b/modules/codegen/src/main/java/org/apache/ignite/codegen/SystemViewRowAttributeWalkerGenerator.java
index 879b5f833fc..de0be996790 100644
---
a/modules/codegen/src/main/java/org/apache/ignite/codegen/SystemViewRowAttributeWalkerGenerator.java
+++
b/modules/codegen/src/main/java/org/apache/ignite/codegen/SystemViewRowAttributeWalkerGenerator.java
@@ -173,14 +173,14 @@ public class SystemViewRowAttributeWalkerGenerator {
* @throws IOException If generation failed.
*/
private <T> void generateAndWrite(Class<T> clazz, String srcRoot) throws
IOException {
- File walkerClass = new File(srcRoot + '/' +
WALKER_PACKAGE.replaceAll("\\.", "/") + '/' +
+ File walkerCls = new File(srcRoot + '/' +
WALKER_PACKAGE.replaceAll("\\.", "/") + '/' +
clazz.getSimpleName() + "Walker.java");
Collection<String> code = generate(clazz);
- walkerClass.createNewFile();
+ walkerCls.createNewFile();
- try (FileWriter writer = new FileWriter(walkerClass)) {
+ try (FileWriter writer = new FileWriter(walkerCls)) {
for (String line : code) {
writer.write(line);
writer.write('\n');
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java
index fd7acf71318..6f59a0f098a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java
@@ -613,7 +613,7 @@ class GridDeploymentClassLoader extends ClassLoader
implements GridDeploymentInf
nodeLdrMapCp = singleNode ? nodeLdrMap : new HashMap<>(nodeLdrMap);
}
- List<IgniteException> classRequestExceptions = new ArrayList<>();
+ List<IgniteException> clsRequestExceptions = new ArrayList<>();
for (UUID nodeId : nodeListCp) {
if (nodeId.equals(ctx.discovery().localNode().id()))
@@ -644,7 +644,7 @@ class GridDeploymentClassLoader extends ClassLoader
implements GridDeploymentInf
LT.warn(log, msg);
- classRequestExceptions.add(new IgniteException(msg));
+ clsRequestExceptions.add(new IgniteException(msg));
synchronized (mux) {
if (missedRsrcs != null)
@@ -683,20 +683,20 @@ class GridDeploymentClassLoader extends ClassLoader
implements GridDeploymentInf
else if (log.isDebugEnabled())
log.debug(msg);
- classRequestExceptions.add(new IgniteException(msg, e));
+ clsRequestExceptions.add(new IgniteException(msg, e));
}
}
catch (TimeoutException e) {
- classRequestExceptions.add(new IgniteException("Failed to send
class-loading request to node (is node alive?) " +
+ clsRequestExceptions.add(new IgniteException("Failed to send
class-loading request to node (is node alive?) " +
"[node=" + node.id() + ", clsName=" + name + ", clsPath="
+ path + ", clsLdrId=" + ldrId +
", clsLoadersHierarchy=" + clsLdrHierarchy + ']', e));
}
}
- if (!classRequestExceptions.isEmpty()) {
- IgniteException exception = classRequestExceptions.remove(0);
+ if (!clsRequestExceptions.isEmpty()) {
+ IgniteException exception = clsRequestExceptions.remove(0);
- for (Exception e : classRequestExceptions)
+ for (Exception e : clsRequestExceptions)
exception.addSuppressed(e);
LT.warn(log, exception.getMessage(), exception);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
index 981b15031cf..aef7adc7f69 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
@@ -566,7 +566,7 @@ public class GridDhtPartitionsFullMessage extends
GridDhtPartitionsAbstractMessa
@Override public void finishUnmarshal(GridCacheSharedContext ctx,
ClassLoader ldr) throws IgniteCheckedException {
super.finishUnmarshal(ctx, ldr);
- ClassLoader classLoader = U.resolveClassLoader(ldr, ctx.gridConfig());
+ ClassLoader clsLoader = U.resolveClassLoader(ldr, ctx.gridConfig());
Collection<byte[]> objectsToUnmarshall = new ArrayList<>();
@@ -598,8 +598,8 @@ public class GridDhtPartitionsFullMessage extends
GridDhtPartitionsAbstractMessa
new IgniteThrowableFunction<byte[], Object>() {
@Override public Object apply(byte[] binary) throws
IgniteCheckedException {
return compressed()
- ? U.unmarshalZip(ctx.marshaller(), binary, classLoader)
- : U.unmarshal(ctx, binary, classLoader);
+ ? U.unmarshalZip(ctx.marshaller(), binary, clsLoader)
+ : U.unmarshal(ctx, binary, clsLoader);
}
}
);
diff --git
a/modules/core/src/test/java/org/apache/ignite/ClassPathContentLoggingTest.java
b/modules/core/src/test/java/org/apache/ignite/ClassPathContentLoggingTest.java
index 0a2e6395b92..18fbc0c72de 100644
---
a/modules/core/src/test/java/org/apache/ignite/ClassPathContentLoggingTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/ClassPathContentLoggingTest.java
@@ -83,7 +83,7 @@ public class ClassPathContentLoggingTest extends
GridCommonAbstractTest {
*/
@Test
public void testClassPathContentLogging() throws Exception {
- String javaClassPath = System.getProperty("java.class.path", ".");
+ String javaClsPath = System.getProperty("java.class.path", ".");
LogListener lsnr = LogListener
.matches("List of files containing in classpath")
@@ -110,7 +110,7 @@ public class ClassPathContentLoggingTest extends
GridCommonAbstractTest {
for (Path jar : jars)
contenLsnrBuilder.andMatches(jar.getFileName().toString());
- Arrays.stream(javaClassPath.split(File.separator))
+ Arrays.stream(javaClsPath.split(File.separator))
.filter(fileName -> new File(fileName).isDirectory())
.forEach(contenLsnrBuilder::andMatches);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java
index 59c85b30de6..1e424c2d19c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java
@@ -84,7 +84,7 @@ public class MarshallerContextLockingSelfTest extends
GridCommonAbstractTest {
public void testMultithreadedUpdate() throws Exception {
multithreaded(new Callable<Object>() {
@Override public Object call() throws Exception {
- GridTestClassLoader classLoader = new GridTestClassLoader(
+ GridTestClassLoader clsLoader = new GridTestClassLoader(
InternalExecutor.class.getName(),
MarshallerContextImpl.class.getName(),
MarshallerContextImpl.CombinedMap.class.getName(),
@@ -93,9 +93,9 @@ public class MarshallerContextLockingSelfTest extends
GridCommonAbstractTest {
MarshallerMappingTransport.class.getName()
);
- Thread.currentThread().setContextClassLoader(classLoader);
+ Thread.currentThread().setContextClassLoader(clsLoader);
- Class clazz =
classLoader.loadClass(InternalExecutor.class.getName());
+ Class clazz =
clsLoader.loadClass(InternalExecutor.class.getName());
Object internelExecutor = clazz.newInstance();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index 55e08d3640f..0c5992958d0 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -1541,8 +1541,8 @@ public class BinaryMarshallerSelfTest extends
AbstractBinaryArraysTest {
*/
@Test
public void testSimpleNameLowerCaseMappers() throws Exception {
- BinaryTypeConfiguration innerClassType = new
BinaryTypeConfiguration(InnerMappedObject.class.getName());
- BinaryTypeConfiguration publicClassType = new
BinaryTypeConfiguration(TestMappedObject.class.getName());
+ BinaryTypeConfiguration innerClsType = new
BinaryTypeConfiguration(InnerMappedObject.class.getName());
+ BinaryTypeConfiguration publicClsType = new
BinaryTypeConfiguration(TestMappedObject.class.getName());
BinaryTypeConfiguration typeWithCustomMapper = new
BinaryTypeConfiguration(CustomMappedObject2.class.getName());
typeWithCustomMapper.setIdMapper(new BinaryIdMapper() {
@@ -1565,7 +1565,7 @@ public class BinaryMarshallerSelfTest extends
AbstractBinaryArraysTest {
});
BinaryMarshaller marsh = binaryMarshaller(new
BinaryBasicNameMapper(true), new BinaryBasicIdMapper(true),
- Arrays.asList(innerClassType, publicClassType,
typeWithCustomMapper));
+ Arrays.asList(innerClsType, publicClsType, typeWithCustomMapper));
InnerMappedObject innerObj = new InnerMappedObject(10, "str1");
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectToStringTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectToStringTest.java
index 452f3f91997..6a1d9253fb3 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectToStringTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectToStringTest.java
@@ -150,62 +150,62 @@ public class BinaryObjectToStringTest extends
AbstractBinaryArraysTest {
/** */
private Object newExtInstance1() throws Exception {
- ClassPool classPool = new ClassPool(ClassPool.getDefault());
-
- CtClass aClass = classPool.makeClass("ExternalTestClass1");
- aClass.addInterface(classPool.get("java.io.Externalizable"));
- aClass.addField(CtField.make("private int x;", aClass));
- aClass.addConstructor(CtNewConstructor.make("public
ExternalTestClass1() {}", aClass));
- aClass.addConstructor(CtNewConstructor.make("public
ExternalTestClass1(int x0) { x = x0; }", aClass));
- aClass.addMethod(CtNewMethod.make(
+ ClassPool clsPool = new ClassPool(ClassPool.getDefault());
+
+ CtClass aCls = clsPool.makeClass("ExternalTestClass1");
+ aCls.addInterface(clsPool.get("java.io.Externalizable"));
+ aCls.addField(CtField.make("private int x;", aCls));
+ aCls.addConstructor(CtNewConstructor.make("public ExternalTestClass1()
{}", aCls));
+ aCls.addConstructor(CtNewConstructor.make("public
ExternalTestClass1(int x0) { x = x0; }", aCls));
+ aCls.addMethod(CtNewMethod.make(
"public void writeExternal(java.io.ObjectOutput out) throws
java.io.IOException { out.writeInt(x); }",
- aClass));
- aClass.addMethod(CtNewMethod.make(
+ aCls));
+ aCls.addMethod(CtNewMethod.make(
"public void readExternal(java.io.ObjectInput in) throws
java.io.IOException { x = in.readInt(); }",
- aClass));
+ aCls));
ClassLoader extClsLdr = new ClassLoader() {
{
- byte[] bytecode = aClass.toBytecode();
+ byte[] bytecode = aCls.toBytecode();
defineClass("ExternalTestClass1", bytecode, 0,
bytecode.length);
}
};
- Class<?> extClass = extClsLdr.loadClass("ExternalTestClass1");
+ Class<?> extCls = extClsLdr.loadClass("ExternalTestClass1");
- Constructor<?> ctor = extClass.getConstructor(int.class);
+ Constructor<?> ctor = extCls.getConstructor(int.class);
return ctor.newInstance(42);
}
/** */
private Object newExtInstance2() throws Exception {
- ClassPool classPool = new ClassPool(ClassPool.getDefault());
-
- CtClass aClass = classPool.makeClass("ExternalTestClass2");
- aClass.addInterface(classPool.get("java.io.Serializable"));
- aClass.addField(CtField.make("private int x;", aClass));
- aClass.addConstructor(CtNewConstructor.make("public
ExternalTestClass2() {}", aClass));
- aClass.addConstructor(CtNewConstructor.make("public
ExternalTestClass2(int x0) { x = x0; }", aClass));
- aClass.addMethod(CtNewMethod.make(
+ ClassPool clsPool = new ClassPool(ClassPool.getDefault());
+
+ CtClass aCls = clsPool.makeClass("ExternalTestClass2");
+ aCls.addInterface(clsPool.get("java.io.Serializable"));
+ aCls.addField(CtField.make("private int x;", aCls));
+ aCls.addConstructor(CtNewConstructor.make("public ExternalTestClass2()
{}", aCls));
+ aCls.addConstructor(CtNewConstructor.make("public
ExternalTestClass2(int x0) { x = x0; }", aCls));
+ aCls.addMethod(CtNewMethod.make(
"private void writeObject(java.io.ObjectOutputStream out) throws
java.io.IOException { out.writeInt(x); }",
- aClass));
- aClass.addMethod(CtNewMethod.make(
+ aCls));
+ aCls.addMethod(CtNewMethod.make(
"private void readObject(java.io.ObjectInputStream in) throws
java.io.IOException { x = in.readInt(); }",
- aClass));
+ aCls));
ClassLoader extClsLdr = new ClassLoader() {
{
- byte[] bytecode = aClass.toBytecode();
+ byte[] bytecode = aCls.toBytecode();
defineClass("ExternalTestClass2", bytecode, 0,
bytecode.length);
}
};
- Class<?> extClass = extClsLdr.loadClass("ExternalTestClass2");
+ Class<?> extCls = extClsLdr.loadClass("ExternalTestClass2");
- Constructor<?> ctor = extClass.getConstructor(int.class);
+ Constructor<?> ctor = extCls.getConstructor(int.class);
return ctor.newInstance(42);
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java
index 91b0f86eab6..44dc9491f32 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java
@@ -65,9 +65,9 @@ public abstract class IgniteCacheAbstractExecutionContextTest
extends IgniteCach
*/
@Test
public void testUsersClassLoader() throws Exception {
- UsersClassLoader testClassLdr =
(UsersClassLoader)grid(0).configuration().getClassLoader();
+ UsersClassLoader testClsLdr =
(UsersClassLoader)grid(0).configuration().getClassLoader();
- Object val = testClassLdr.loadClass(TEST_VALUE).newInstance();
+ Object val = testClsLdr.loadClass(TEST_VALUE).newInstance();
IgniteCache<Object, Object> jcache = grid(0).cache(DEFAULT_CACHE_NAME);
@@ -79,7 +79,7 @@ public abstract class IgniteCacheAbstractExecutionContextTest
extends IgniteCach
// Check that entry was loaded by user's classloader.
if (idx == 0)
- assertEquals(testClassLdr,
jcache.get(i).getClass().getClassLoader());
+ assertEquals(testClsLdr,
jcache.get(i).getClass().getClassLoader());
else
assertEquals(grid(idx).configuration().getClassLoader(),
grid(idx).cache(DEFAULT_CACHE_NAME).get(i).getClass().getClassLoader());
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
index 552b9954ea4..82389744395 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
@@ -1525,7 +1525,7 @@ public class IgniteUtilsSelfTest extends
GridCommonAbstractTest {
System.out.println(localVar);
};
- Runnable capturingOuterClassLambda = () -> {
+ Runnable capturingOuterClsLambda = () -> {
System.out.println(repeatRule);
};
@@ -1533,7 +1533,7 @@ public class IgniteUtilsSelfTest extends
GridCommonAbstractTest {
assertTrue(IgniteUtils.isLambda(someLambda.getClass()));
assertTrue(IgniteUtils.isLambda(capturingLocalLambda.getClass()));
- assertTrue(IgniteUtils.isLambda(capturingOuterClassLambda.getClass()));
+ assertTrue(IgniteUtils.isLambda(capturingOuterClsLambda.getClass()));
assertTrue(IgniteUtils.isLambda(methodReference.getClass()));
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
index 5324bd7efaa..4b2987c1431 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
@@ -455,9 +455,9 @@ public class GridToStringBuilderSelfTest extends
GridCommonAbstractTest {
Map strMap = new TreeMap<>();
List strList = new ArrayList<>(limit + 1);
- TestClass1 testClass = new TestClass1();
- testClass.strMap = strMap;
- testClass.strListIncl = strList;
+ TestClass1 testCls = new TestClass1();
+ testCls.strMap = strMap;
+ testCls.strListIncl = strList;
Map m = new TreeMap();
m.put("m", strMap);
@@ -473,7 +473,7 @@ public class GridToStringBuilderSelfTest extends
GridCommonAbstractTest {
strList.add("e");
}
- checkColAndMap(testClass);
+ checkColAndMap(testCls);
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextSelfTest.java
index ff7d6b99911..0511b7b64f1 100644
---
a/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextSelfTest.java
@@ -103,13 +103,13 @@ public class MarshallerContextSelfTest extends
GridCommonAbstractTest {
*/
@Test
public void testMultiplatformMappingsCollecting() throws Exception {
- String nonJavaClassName = "random.platform.Mapping";
+ String nonJavaClsName = "random.platform.Mapping";
MarshallerContextImpl marshCtx = new MarshallerContextImpl(null, null);
marshCtx.onMarshallerProcessorStarted(ctx, null);
- MarshallerMappingItem item = new MarshallerMappingItem((byte)2, 101,
nonJavaClassName);
+ MarshallerMappingItem item = new MarshallerMappingItem((byte)2, 101,
nonJavaClsName);
marshCtx.onMappingProposed(item);
@@ -129,7 +129,7 @@ public class MarshallerContextSelfTest extends
GridCommonAbstractTest {
assertNotNull(nonJavaMappings.get(101));
- assertEquals(nonJavaClassName, nonJavaMappings.get(101).className());
+ assertEquals(nonJavaClsName, nonJavaMappings.get(101).className());
}
/**
@@ -140,13 +140,13 @@ public class MarshallerContextSelfTest extends
GridCommonAbstractTest {
*/
@Test
public void testMultiplatformMappingsDistributing() throws Exception {
- String nonJavaClassName = "random.platform.Mapping";
+ String nonJavaClsName = "random.platform.Mapping";
Ignite grid0 = startGrid(0);
MarshallerContextImpl marshCtx0 =
((IgniteKernal)grid0).context().marshallerContext();
- MarshallerMappingItem item = new MarshallerMappingItem((byte)2, 101,
nonJavaClassName);
+ MarshallerMappingItem item = new MarshallerMappingItem((byte)2, 101,
nonJavaClsName);
marshCtx0.onMappingProposed(item);
@@ -156,7 +156,7 @@ public class MarshallerContextSelfTest extends
GridCommonAbstractTest {
MarshallerContextImpl marshCtx1 =
((IgniteKernal)grid1).context().marshallerContext();
- assertEquals(nonJavaClassName, marshCtx1.getClassName((byte)2, 101));
+ assertEquals(nonJavaClsName, marshCtx1.getClassName((byte)2, 101));
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/p2p/DeploymentClassLoaderCallableTest.java
b/modules/core/src/test/java/org/apache/ignite/p2p/DeploymentClassLoaderCallableTest.java
index 40aa51a1b55..e7c32d7b956 100644
---
a/modules/core/src/test/java/org/apache/ignite/p2p/DeploymentClassLoaderCallableTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/p2p/DeploymentClassLoaderCallableTest.java
@@ -113,10 +113,10 @@ public class DeploymentClassLoaderCallableTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
private void runJob1(Ignite ignite, long timeout) throws Exception {
- ClassLoader testClassLoader1 = new GridTestExternalClassLoader(new
URL[] {
+ ClassLoader testClsLoader1 = new GridTestExternalClassLoader(new URL[]
{
new URL(GridTestProperties.getProperty("p2p.uri.cls"))}, RUN_CLS,
RUN_CLS2);
- Constructor ctor =
testClassLoader1.loadClass(RUN_CLS1).getConstructor();
+ Constructor ctor = testClsLoader1.loadClass(RUN_CLS1).getConstructor();
ignite.compute().withTimeout(timeout).broadcast((IgniteCallable<?>)ctor.newInstance());
}
@@ -126,10 +126,10 @@ public class DeploymentClassLoaderCallableTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
private void runJob0(Ignite ignite, long timeout) throws Exception {
- ClassLoader testClassLoader = new GridTestExternalClassLoader(new
URL[] {
+ ClassLoader testClsLoader = new GridTestExternalClassLoader(new URL[] {
new URL(GridTestProperties.getProperty("p2p.uri.cls"))}, RUN_CLS1,
RUN_CLS2);
- Constructor ctor = testClassLoader.loadClass(RUN_CLS).getConstructor();
+ Constructor ctor = testClsLoader.loadClass(RUN_CLS).getConstructor();
ignite.compute().withTimeout(timeout).broadcast((IgniteCallable<?>)ctor.newInstance());
}
@@ -139,10 +139,10 @@ public class DeploymentClassLoaderCallableTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
private void runJob2(Ignite ignite, long timeout) throws Exception {
- ClassLoader testClassLoader = new GridTestExternalClassLoader(new
URL[] {
+ ClassLoader testClsLoader = new GridTestExternalClassLoader(new URL[] {
new URL(GridTestProperties.getProperty("p2p.uri.cls"))}, RUN_CLS,
RUN_CLS1);
- Constructor ctor =
testClassLoader.loadClass(RUN_CLS2).getConstructor();
+ Constructor ctor = testClsLoader.loadClass(RUN_CLS2).getConstructor();
ignite.compute().withTimeout(timeout).broadcast((IgniteCallable<?>)ctor.newInstance());
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index d43553d045c..d7a1d9072fc 100755
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -774,10 +774,10 @@ public abstract class GridAbstractTest extends
JUnitAssertAware {
*/
private ScheduledExecutorService
scheduleThreadDumpOnAfterTestTimeOut(AtomicBoolean afterTestFinished) {
// Compute class name as string to avoid holding reference to the test
class instance in task.
- String testClassName = getClass().getName();
+ String testClsName = getClass().getName();
ScheduledExecutorService scheduler =
Executors.newScheduledThreadPool(1, task -> {
- Thread thread = new Thread(task, "after-test-timeout-" +
testClassName);
+ Thread thread = new Thread(task, "after-test-timeout-" +
testClsName);
thread.setDaemon(true);
return thread;
});
@@ -786,7 +786,7 @@ public abstract class GridAbstractTest extends
JUnitAssertAware {
scheduler.shutdownNow();
if (!afterTestFinished.get()) {
- log.info(testClassName +
+ log.info(testClsName +
".afterTest() timed out, dumping threads (afterTest()
still keeps running)");
dumpThreadsReliably();
diff --git
a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/classloadproblem/P2PClassLoadingProblems.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/classloadproblem/P2PClassLoadingProblems.java
index 332aa1ccee4..751d919fa62 100644
---
a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/classloadproblem/P2PClassLoadingProblems.java
+++
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/classloadproblem/P2PClassLoadingProblems.java
@@ -39,14 +39,14 @@ class P2PClassLoadingProblems {
/***/
private static void unregisterAllRemoteNodesFromP2PClassLoader(Class<?>
classLoadedViaP2P, Ignite ignite) {
- ClassLoader classLoader = classLoadedViaP2P.getClassLoader();
+ ClassLoader clsLoader = classLoadedViaP2P.getClassLoader();
List<UUID> remoteNodeIds = ignite.cluster().forRemotes().nodes()
.stream()
.map(ClusterNode::id)
.collect(toList());
- remoteNodeIds.forEach(remoteNodeId ->
unregisterNodeOnClassLoader(classLoader, remoteNodeId));
+ remoteNodeIds.forEach(remoteNodeId ->
unregisterNodeOnClassLoader(clsLoader, remoteNodeId));
}
/***/
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/AbstractSchemaSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/AbstractSchemaSelfTest.java
index e7437e57f8f..f1c6386b0cf 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/AbstractSchemaSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/AbstractSchemaSelfTest.java
@@ -669,9 +669,9 @@ public abstract class AbstractSchemaSelfTest extends
AbstractIndexingCommonTest
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- KeyClass keyClass = (KeyClass)o;
+ KeyClass keyCls = (KeyClass)o;
- return id == keyClass.id;
+ return id == keyCls.id;
}
diff --git
a/modules/tools/src/main/java8/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
b/modules/tools/src/main/java8/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
index 3051e199323..805f2614eae 100644
---
a/modules/tools/src/main/java8/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
+++
b/modules/tools/src/main/java8/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
@@ -122,18 +122,18 @@ public class IgniteLinkTaglet implements Taglet {
File f = tag.position().file();
- String curClass = f == null ? "" :
f.getAbsolutePath().replace(File.separator, ".");
+ String curCls = f == null ? "" :
f.getAbsolutePath().replace(File.separator, ".");
String packPref = "src.main.java.";
- int idx = curClass.indexOf(packPref);
+ int idx = curCls.indexOf(packPref);
StringBuilder path = new StringBuilder();
if (idx != -1) {
- curClass = curClass.substring(idx + packPref.length());
+ curCls = curCls.substring(idx + packPref.length());
- for (int i = 0, n = curClass.split("\\.").length - 2; i < n; i++)
+ for (int i = 0, n = curCls.split("\\.").length - 2; i < n; i++)
path.append("../");
}
