You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2023/12/09 06:05:13 UTC
(ignite) branch master updated: IGNITE-14823 Abbrevation checkstyle rule (#9153)
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 6ccc32e2cbe IGNITE-14823 Abbrevation checkstyle rule (#9153)
6ccc32e2cbe is described below
commit 6ccc32e2cbeda36026a8ebffa1fd4b04839bfb9e
Author: Nikolay <ni...@apache.org>
AuthorDate: Sat Dec 9 09:05:07 2023 +0300
IGNITE-14823 Abbrevation checkstyle rule (#9153)
---
checkstyle/checkstyle.xml | 3 +
modules/checkstyle/pom.xml | 16 ++
.../tools/checkstyle/IgniteAbbrevationsRule.java | 177 +++++++++++++++++++++
.../src/main/resources/abbrevations-exclude.txt | 1 +
.../checkstyle/src/main/resources/abbrevations.csv | 71 +++++++++
.../checkstyle/IgniteAbbrevationRuleTest.java | 95 +++++++++++
.../apache/ignite/util/GridCommandHandlerTest.java | 8 +-
.../maintenance/MaintenanceRebuildIndexUtils.java | 14 +-
.../jdbc/thin/ConnectionPropertiesImpl.java | 14 +-
.../management/baseline/BaselineTaskResult.java | 4 +-
.../systemview/IgniteConfigurationIterable.java | 6 +-
.../wal/filehandle/FileWriteHandleImpl.java | 6 +-
.../apache/ignite/internal/util/IgniteUtils.java | 4 +-
.../ignite/internal/util/io/GridFilenameUtils.java | 56 +++----
.../sharedfs/TcpDiscoverySharedFsIpFinder.java | 4 +-
.../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java | 10 +-
...rNodeAttributeAffinityBackupFilterSelfTest.java | 6 +-
.../internal/client/thin/ReliableChannelTest.java | 4 +-
.../optimized/OptimizedObjectStreamSelfTest.java | 4 +-
.../GridCacheBinaryObjectsAbstractSelfTest.java | 4 +-
.../cache/persistence/file/FileDownloaderTest.java | 6 +-
.../persistence/pagemem/PageMemoryImplTest.java | 8 +-
.../ignite/internal/util/IgniteUtilsSelfTest.java | 16 +-
.../apache/ignite/util/GridLongListSelfTest.java | 14 +-
.../utils/IgniteWalConverterArguments.java | 4 +-
.../persistence/db/wal/IgniteWalRecoveryTest.java | 10 +-
.../query/WrongQueryEntityFieldTypeTest.java | 4 +-
...achePartitionedAtomicColumnConstraintsTest.java | 8 +-
.../org/apache/ignite/sqltests/BaseSqlTest.java | 4 +-
.../KubernetesServiceAddressResolver.java | 4 +-
parent/pom.xml | 9 +-
31 files changed, 482 insertions(+), 112 deletions(-)
diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index 513016577da..b64eba3540d 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -191,6 +191,9 @@
<module name="RightCurly">
<property name="option" value="alone" />
</module>
+
+ <!-- Usage of Ignite abbrevations check. -->
+ <module name="org.apache.ignite.tools.checkstyle.IgniteAbbrevationsRule"/>
</module>
<!--
diff --git a/modules/checkstyle/pom.xml b/modules/checkstyle/pom.xml
index 9b95ba972be..dc2f13d9c2a 100644
--- a/modules/checkstyle/pom.xml
+++ b/modules/checkstyle/pom.xml
@@ -41,6 +41,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.flatten.file.name>pom-installed.xml</maven.flatten.file.name>
<revision>2.17.0-SNAPSHOT</revision>
+ <checkstyle.puppycrawl.version>8.45</checkstyle.puppycrawl.version>
</properties>
<url>https://ignite.apache.org</url>
@@ -64,6 +65,21 @@
</mailingList>
</mailingLists>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${checkstyle.puppycrawl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
diff --git a/modules/checkstyle/src/main/java/org/apache/ignite/tools/checkstyle/IgniteAbbrevationsRule.java b/modules/checkstyle/src/main/java/org/apache/ignite/tools/checkstyle/IgniteAbbrevationsRule.java
new file mode 100644
index 00000000000..8b614a77c7d
--- /dev/null
+++ b/modules/checkstyle/src/main/java/org/apache/ignite/tools/checkstyle/IgniteAbbrevationsRule.java
@@ -0,0 +1,177 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.tools.checkstyle;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
+import com.puppycrawl.tools.checkstyle.api.DetailAST;
+import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+
+/**
+ * Rule that check Ignite abbervations used through project source code.
+ * @see <a href="https://cwiki.apache.org/confluence/display/IGNITE/Abbreviation+Rules#AbbreviationRules-VariableAbbreviation">
+ * Ignite abbrevation rules</a>
+ */
+public class IgniteAbbrevationsRule extends AbstractCheck {
+ /** File with abbrevations. */
+ public static final String ABBREVS_FILE = "/abbrevations.csv";
+
+ /** File with exclusions. */
+ public static final String ABBREVS_EXCL_FILE = "/abbrevations-exclude.txt";
+
+ /** */
+ public static final char DELIM = ',';
+
+ /** */
+ private static final int[] TOKENS = new int[] {
+ TokenTypes.VARIABLE_DEF, TokenTypes.PATTERN_VARIABLE_DEF
+ };
+
+ /**
+ * Key is wrong term that should be replaced with abbrevations.
+ * Value possible substitions to generate self-explained error message.
+ */
+ private static final Map<String, String> ABBREVS = new HashMap<>();
+
+ /** Exclusions. */
+ private static final Set<String> EXCL = new HashSet<>();
+
+ static {
+ forEachLine(ABBREVS_FILE, line -> {
+ line = line.toLowerCase();
+
+ int firstDelim = line.indexOf(DELIM);
+
+ assert firstDelim > 0;
+
+ String term = line.substring(0, firstDelim);
+ String[] substitutions = line.substring(firstDelim + 1).split("" + DELIM);
+
+ assert substitutions.length > 0;
+
+ ABBREVS.put(term, String.join(", ", substitutions));
+ });
+
+ forEachLine(ABBREVS_EXCL_FILE, EXCL::add);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void visitToken(DetailAST ast) {
+ DetailAST parent = ast.getParent();
+
+ if (parent.getType() == TokenTypes.OBJBLOCK)
+ return;
+
+ DetailAST token = ast.findFirstToken(TokenTypes.IDENT);
+
+ String varName = token.getText();
+
+ if (EXCL.contains(varName))
+ return;
+
+ List<String> words = words(varName);
+
+ for (String word : words) {
+ if (ABBREVS.containsKey(word.toLowerCase())) {
+ log(
+ token.getLineNo(),
+ "Abbrevation should be used for {0}! Please, use {1}, instead of {2}",
+ varName,
+ ABBREVS.get(word.toLowerCase()),
+ word
+ );
+ }
+ }
+ }
+
+ /**
+ * @param varName Variable name.
+ * @return Words list.
+ */
+ public static List<String> words(String varName) {
+ if (varName.indexOf('_') != -1)
+ return Arrays.asList(varName.split("_"));
+
+ List<String> words = new ArrayList<>();
+
+ int start = 0;
+ boolean allUpper = Character.isUpperCase(varName.charAt(0));
+
+ for (int i = 1; i < varName.length(); i++) {
+ if (Character.isUpperCase(varName.charAt(i))) {
+ if (allUpper)
+ continue;
+
+ words.add(varName.substring(start, i));
+ start = i;
+ allUpper = true;
+ }
+ else
+ allUpper = false;
+ }
+
+ words.add(varName.substring(start));
+
+ return words;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int[] getDefaultTokens() {
+ return TOKENS.clone();
+ }
+
+ /** {@inheritDoc} */
+ @Override public int[] getAcceptableTokens() {
+ return TOKENS.clone();
+ }
+
+ /** {@inheritDoc} */
+ @Override public int[] getRequiredTokens() {
+ return TOKENS.clone();
+ }
+
+ /** */
+ private static void forEachLine(String file, Consumer<String> lineProc) {
+ InputStream stream = IgniteAbbrevationsRule.class.getResourceAsStream(file);
+
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(stream))) {
+ String line;
+
+ while ((line = br.readLine()) != null) {
+ if (line.startsWith("#"))
+ continue;
+
+ lineProc.accept(line);
+ }
+ }
+ catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
diff --git a/modules/checkstyle/src/main/resources/abbrevations-exclude.txt b/modules/checkstyle/src/main/resources/abbrevations-exclude.txt
new file mode 100644
index 00000000000..d265eeb9aa7
--- /dev/null
+++ b/modules/checkstyle/src/main/resources/abbrevations-exclude.txt
@@ -0,0 +1 @@
+serialVersionUID
\ No newline at end of file
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv
new file mode 100644
index 00000000000..82840f6518b
--- /dev/null
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -0,0 +1,71 @@
+# First word is wrong full term, other is correct abbrevations to build helpfull error message.
+address,addr
+addresses,addrs
+#affinity,aff
+#argument,arg
+array,arr
+#attribute,attr
+#attributes,attrs
+#buffer,buf
+#class,cls
+#command,cmd
+#config,cfg
+#context,ctx
+#count,cnt
+#current,cur
+#database,db
+#default,dflt
+#destination,dest
+#directory,dir
+#event,evt
+#exception,e,e2,ex
+#execute,exec
+#frequency,freq
+#future,fut
+#group,grp
+#handler,hnd
+#header,hdr
+#implementation,impl
+#index,idx
+#initial,init
+#initialize,init
+#iterator,iter
+#label,lbl
+#local,loc
+#logger,log
+#loader,ldr
+#manager,mgr
+#message,msg
+#mutex,mux
+#network,net
+#object,obj
+#package,pkg
+#parameter,param
+#password,pwd
+#policy,plc
+#property,prop
+#properties,props
+#process,proc
+#processor,proc
+#query,qry
+#receive,rcv
+#reference,ref
+#regularexpression,regex
+#repository,repo
+#request,req
+#resource,rsrc
+#response,res
+#returnValue,retVal
+#sender,snd
+#service,srvc
+#session,ses
+#sequence,seq
+#socket,sock
+#source,src
+#string,s,str
+#subject,subj
+#system,sys
+#topology,top
+#topologyversion,topVer
+#value,val
+#version,ver
\ No newline at end of file
diff --git a/modules/checkstyle/src/test/java/org/apache/ignite/tools/checkstyle/IgniteAbbrevationRuleTest.java b/modules/checkstyle/src/test/java/org/apache/ignite/tools/checkstyle/IgniteAbbrevationRuleTest.java
new file mode 100644
index 00000000000..6f181133ab6
--- /dev/null
+++ b/modules/checkstyle/src/test/java/org/apache/ignite/tools/checkstyle/IgniteAbbrevationRuleTest.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.tools.checkstyle;
+
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Test;
+
+/** */
+public class IgniteAbbrevationRuleTest {
+ /** */
+ @Test
+ public void testVarToWords() {
+ assertListEquals(
+ Arrays.asList("XXX", "YYY", "ZZZ"),
+ IgniteAbbrevationsRule.words("XXX_YYY_ZZZ")
+ );
+
+ assertListEquals(
+ Arrays.asList("XXX"),
+ IgniteAbbrevationsRule.words("XXX")
+ );
+
+ assertListEquals(
+ Arrays.asList("i"),
+ IgniteAbbrevationsRule.words("i")
+ );
+
+ assertListEquals(
+ Arrays.asList("i1"),
+ IgniteAbbrevationsRule.words("i1")
+ );
+
+ assertListEquals(
+ Arrays.asList("my", "Name"),
+ IgniteAbbrevationsRule.words("myName")
+ );
+
+ assertListEquals(
+ Arrays.asList("my", "Name", "And", "Other"),
+ IgniteAbbrevationsRule.words("myNameAndOther")
+ );
+
+ assertListEquals(
+ Arrays.asList("my", "URL"),
+ IgniteAbbrevationsRule.words("myURL")
+ );
+
+ assertListEquals(
+ Arrays.asList("my", "URL1"),
+ IgniteAbbrevationsRule.words("myURL1")
+ );
+
+ assertListEquals(
+ Arrays.asList("a", "Name"),
+ IgniteAbbrevationsRule.words("aName")
+ );
+ }
+
+ /** */
+ public void assertListEquals(List<String> expected, List<String> actual) {
+ if (expected == actual)
+ return;
+
+ if (expected == null)
+ throw new AssertionError("Expected null but got " + actual);
+
+ if (actual == null)
+ throw new AssertionError("Expected [" + String.join(", ", expected) + "] but got null");
+
+ if (expected.size() != actual.size()) {
+ throw new AssertionError("Size of list differs! " +
+ "Expected [" + String.join(", ", expected) + "] but got [" + String.join(", ", actual) + ']');
+ }
+
+ for (int i = 0; i < expected.size(); i++)
+ Assert.assertEquals("Expected same element at " + i + " index", expected.get(i), actual.get(i));
+ }
+}
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
index a0e46a0fa1d..9747c6275a6 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
@@ -1059,9 +1059,9 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
Ignite ignite = startGrid(
optimize(getConfiguration(getTestIgniteInstanceName(0))).setLocalHost("0.0.0.0"));
- Field addresses = ignite.cluster().node().getClass().getDeclaredField("addrs");
- addresses.setAccessible(true);
- addresses.set(ignite.cluster().node(), Arrays.asList("127.0.0.1", "0:0:0:0:0:0:0:1", "10.19.112.175", "188.166.164.247"));
+ Field addrs = ignite.cluster().node().getClass().getDeclaredField("addrs");
+ addrs.setAccessible(true);
+ addrs.set(ignite.cluster().node(), Arrays.asList("127.0.0.1", "0:0:0:0:0:0:0:1", "10.19.112.175", "188.166.164.247"));
Field hostNames = ignite.cluster().node().getClass().getDeclaredField("hostNames");
hostNames.setAccessible(true);
hostNames.set(ignite.cluster().node(), Arrays.asList("10.19.112.175.hostname"));
@@ -1093,7 +1093,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
}
{ // empty resolved addresses
- addresses.set(ignite.cluster().node(), Collections.emptyList());
+ addrs.set(ignite.cluster().node(), Collections.emptyList());
hostNames.set(ignite.cluster().node(), Collections.emptyList());
assertEquals(EXIT_CODE_OK, execute("--verbose", "--baseline"));
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/maintenance/MaintenanceRebuildIndexUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/maintenance/MaintenanceRebuildIndexUtils.java
index a6a493512be..ba3df191255 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/maintenance/MaintenanceRebuildIndexUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/maintenance/MaintenanceRebuildIndexUtils.java
@@ -60,24 +60,24 @@ public class MaintenanceRebuildIndexUtils {
if (parameters == null)
return Collections.emptyList();
- String[] parametersArray = parameters.split(INDEX_REBUILD_PARAMETER_SEPARATOR_REGEX);
+ String[] parametersArr = parameters.split(INDEX_REBUILD_PARAMETER_SEPARATOR_REGEX);
- if (parametersArray.length == 0)
+ if (parametersArr.length == 0)
return Collections.emptyList();
- assert (parametersArray.length % 2) == 0;
+ assert (parametersArr.length % 2) == 0;
- List<MaintenanceRebuildIndexTarget> params = new ArrayList<>(parametersArray.length / 2);
+ List<MaintenanceRebuildIndexTarget> params = new ArrayList<>(parametersArr.length / 2);
- for (int i = 0; i < parametersArray.length; i += 2) {
- String idxNameEncoded = parametersArray[i + 1];
+ for (int i = 0; i < parametersArr.length; i += 2) {
+ String idxNameEncoded = parametersArr[i + 1];
String idxName = new String(
DECODER.decode(idxNameEncoded.getBytes(StandardCharsets.UTF_8)),
StandardCharsets.UTF_8
);
- params.add(new MaintenanceRebuildIndexTarget(Integer.parseInt(parametersArray[i]), idxName));
+ params.add(new MaintenanceRebuildIndexTarget(Integer.parseInt(parametersArr[i]), idxName));
}
return params;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
index de888ca6f07..3115ff61b9c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
@@ -271,7 +271,7 @@ public class ConnectionPropertiesImpl implements ConnectionProperties, Serializa
"Use specified SQL query engine for a connection.", null, null, false, null);
/** Properties array. */
- private final ConnectionProperty[] propsArray = {
+ private final ConnectionProperty[] propsArr = {
distributedJoins, enforceJoinOrder, collocated, replicatedOnly, autoCloseServerCursor,
tcpNoDelay, lazy, socketSendBuffer, socketReceiveBuffer, skipReducerOnUpdate, nestedTxMode,
sslMode, sslCipherSuites, sslProtocol, sslKeyAlgorithm,
@@ -719,8 +719,8 @@ public class ConnectionPropertiesImpl implements ConnectionProperties, Serializa
if (!F.isEmpty(url))
parseUrl(url, props0);
- for (ConnectionProperty aPropsArray : propsArray)
- aPropsArray.init(props0);
+ for (ConnectionProperty aPropsArr : propsArr)
+ aPropsArr.init(props0);
if (!F.isEmpty(props.getProperty("user"))) {
setUsername(props.getProperty("user"));
@@ -939,10 +939,10 @@ public class ConnectionPropertiesImpl implements ConnectionProperties, Serializa
* @return Driver's properties info array.
*/
public DriverPropertyInfo[] getDriverPropertyInfo() {
- DriverPropertyInfo[] infos = new DriverPropertyInfo[propsArray.length];
+ DriverPropertyInfo[] infos = new DriverPropertyInfo[propsArr.length];
- for (int i = 0; i < propsArray.length; ++i)
- infos[i] = propsArray[i].getDriverPropertyInfo();
+ for (int i = 0; i < propsArr.length; ++i)
+ infos[i] = propsArr[i].getDriverPropertyInfo();
return infos;
}
@@ -953,7 +953,7 @@ public class ConnectionPropertiesImpl implements ConnectionProperties, Serializa
public Properties storeToProperties() {
Properties props = new Properties();
- for (ConnectionProperty prop : propsArray) {
+ for (ConnectionProperty prop : propsArr) {
if (prop.valueObject() != null)
props.setProperty(PROP_PREFIX + prop.getName(), prop.valueObject());
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineTaskResult.java
index 57e44826c92..4a8102dfc67 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineTaskResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineTaskResult.java
@@ -108,8 +108,8 @@ public class BaselineTaskResult extends VisorDataTransferObject {
Collection<BaselineNode.ResolvedAddresses> addrs = new ArrayList<>();
if (node instanceof IgniteClusterNode) {
- for (InetAddress inetAddress: resolveInetAddresses((ClusterNode)node))
- addrs.add(new BaselineNode.ResolvedAddresses(inetAddress));
+ for (InetAddress inetAddr: resolveInetAddresses((ClusterNode)node))
+ addrs.add(new BaselineNode.ResolvedAddresses(inetAddr));
}
BaselineNode dto = new BaselineNode(node, addrs);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/IgniteConfigurationIterable.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/IgniteConfigurationIterable.java
index ad900ff2039..3eb61926f42 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/IgniteConfigurationIterable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/IgniteConfigurationIterable.java
@@ -146,15 +146,15 @@ public class IgniteConfigurationIterable implements Iterable<ConfigurationView>
Class<?> cls = val.getClass();
- boolean isArray = cls.isArray();
+ boolean isArr = cls.isArray();
- if (isArray)
+ if (isArr)
cls = cls.getComponentType();
if (!checkPkg(cls.getName()))
return false;
- if (isArray) {
+ if (isArr) {
int length = Array.getLength(val);
if (length == 0)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/FileWriteHandleImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/FileWriteHandleImpl.java
index f242ebf22ac..b29aecc78db 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/FileWriteHandleImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/FileWriteHandleImpl.java
@@ -694,12 +694,12 @@ class FileWriteHandleImpl extends AbstractFileHandle implements FileWriteHandle
@Override public void fsync(MappedByteBuffer buf, int index, int len) throws IgniteCheckedException {
try {
boolean isSync = (boolean)JDK15FSyncer.isSync.get(buf);
- long address = (long)JDK15FSyncer.address.get(buf);
+ long addr = (long)JDK15FSyncer.address.get(buf);
- assert address % PAGE_SIZE == 0 : "Buffer's address is not aligned: " + address;
+ assert addr % PAGE_SIZE == 0 : "Buffer's address is not aligned: " + addr;
// Don't need to align manually as MappedMemoryUtils does the alignment
- force.invoke(mappedMemoryUtils, fd.get(buf), address, isSync, index, len);
+ force.invoke(mappedMemoryUtils, fd.get(buf), addr, isSync, index, len);
}
catch (IllegalAccessException | InvocationTargetException e) {
throw new IgniteCheckedException(e);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index de17a4eea7f..37ca4feabe6 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -9891,8 +9891,8 @@ public abstract class IgniteUtils {
Collection<InetSocketAddress> resolved = new HashSet<>();
- for (InetSocketAddress address : sockAddr)
- resolved.addAll(resolveAddress(addrRslvr, address));
+ for (InetSocketAddress addr : sockAddr)
+ resolved.addAll(resolveAddress(addrRslvr, addr));
return resolved;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java
index 7130cd47d41..587ee8969e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java
@@ -357,27 +357,27 @@ public class GridFilenameUtils {
if (prefix < 0)
return null;
- char[] array = new char[size + 2]; // +1 for possible extra slash, +2 for arraycopy
- filename.getChars(0, filename.length(), array, 0);
+ char[] arr = new char[size + 2]; // +1 for possible extra slash, +2 for arraycopy
+ filename.getChars(0, filename.length(), arr, 0);
// fix separators throughout
char otherSeparator = separator == SYSTEM_SEPARATOR ? OTHER_SEPARATOR : SYSTEM_SEPARATOR;
- for (int i = 0; i < array.length; i++) {
- if (array[i] == otherSeparator)
- array[i] = separator;
+ for (int i = 0; i < arr.length; i++) {
+ if (arr[i] == otherSeparator)
+ arr[i] = separator;
}
// add extra separator on the end to simplify code below
boolean lastIsDirectory = true;
- if (array[size - 1] != separator) {
- array[size++] = separator;
+ if (arr[size - 1] != separator) {
+ arr[size++] = separator;
lastIsDirectory = false;
}
// adjoining slashes
for (int i = prefix + 1; i < size; i++) {
- if (array[i] == separator && array[i - 1] == separator) {
- System.arraycopy(array, i, array, i - 1, size - i);
+ if (arr[i] == separator && arr[i - 1] == separator) {
+ System.arraycopy(arr, i, arr, i - 1, size - i);
size--;
i--;
}
@@ -385,11 +385,11 @@ public class GridFilenameUtils {
// dot slash
for (int i = prefix + 1; i < size; i++) {
- if (array[i] == separator && array[i - 1] == '.' &&
- (i == prefix + 1 || array[i - 2] == separator)) {
+ if (arr[i] == separator && arr[i - 1] == '.' &&
+ (i == prefix + 1 || arr[i - 2] == separator)) {
if (i == size - 1)
lastIsDirectory = true;
- System.arraycopy(array, i + 1, array, i - 1, size - i);
+ System.arraycopy(arr, i + 1, arr, i - 1, size - i);
size -= 2;
i--;
}
@@ -398,24 +398,24 @@ public class GridFilenameUtils {
// double dot slash
outer:
for (int i = prefix + 2; i < size; i++) {
- if (array[i] == separator && array[i - 1] == '.' && array[i - 2] == '.' &&
- (i == prefix + 2 || array[i - 3] == separator)) {
+ if (arr[i] == separator && arr[i - 1] == '.' && arr[i - 2] == '.' &&
+ (i == prefix + 2 || arr[i - 3] == separator)) {
if (i == prefix + 2)
return null;
if (i == size - 1)
lastIsDirectory = true;
int j;
for (j = i - 4; j >= prefix; j--) {
- if (array[j] == separator) {
+ if (arr[j] == separator) {
// remove b/../ from a/b/../c
- System.arraycopy(array, i + 1, array, j + 1, size - i);
+ System.arraycopy(arr, i + 1, arr, j + 1, size - i);
size -= i - j;
i = j + 1;
continue outer;
}
}
// remove a/../ from a/../c
- System.arraycopy(array, i + 1, array, prefix, size - i);
+ System.arraycopy(arr, i + 1, arr, prefix, size - i);
size -= i + 1 - prefix;
i = prefix + 1;
}
@@ -425,11 +425,11 @@ public class GridFilenameUtils {
return "";
}
if (size <= prefix) { // should never be less than prefix
- return new String(array, 0, size);
+ return new String(arr, 0, size);
}
if (lastIsDirectory && keepSeparator)
- return new String(array, 0, size); // keep trailing separator
- return new String(array, 0, size - 1); // lose trailing separator
+ return new String(arr, 0, size); // keep trailing separator
+ return new String(arr, 0, size - 1); // lose trailing separator
}
//-----------------------------------------------------------------------
@@ -1239,9 +1239,9 @@ public class GridFilenameUtils {
// loop around a backtrack stack, to handle complex * matching
do {
if (!backtrack.isEmpty()) {
- int[] array = backtrack.pop();
- wcsIdx = array[0];
- textIdx = array[1];
+ int[] arr = backtrack.pop();
+ wcsIdx = arr[0];
+ textIdx = arr[1];
anyChars = true;
}
@@ -1316,23 +1316,23 @@ public class GridFilenameUtils {
if (text.indexOf('?') == -1 && text.indexOf('*') == -1)
return new String[] { text };
- char[] array = text.toCharArray();
+ char[] arr = text.toCharArray();
ArrayList<String> list = new ArrayList<String>();
StringBuilder buffer = new StringBuilder();
- for (int i = 0; i < array.length; i++) {
- if (array[i] == '?' || array[i] == '*') {
+ for (int i = 0; i < arr.length; i++) {
+ if (arr[i] == '?' || arr[i] == '*') {
if (buffer.length() != 0) {
list.add(buffer.toString());
buffer.setLength(0);
}
- if (array[i] == '?')
+ if (arr[i] == '?')
list.add("?");
else if (list.isEmpty() ||
i > 0 && !list.get(list.size() - 1).equals("*"))
list.add("*");
}
else
- buffer.append(array[i]);
+ buffer.append(arr[i]);
}
if (buffer.length() != 0)
list.add(buffer.toString());
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java
index 397af1a5d16..a2b035ec6cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java
@@ -254,8 +254,8 @@ public class TcpDiscoverySharedFsIpFinder extends TcpDiscoveryIpFinderAdapter {
private Iterable<String> distinctNames(Iterable<InetSocketAddress> addresses) {
Set<String> result = new HashSet<>();
- for (InetSocketAddress address : addresses) {
- result.add(name(address));
+ for (InetSocketAddress addr : addresses) {
+ result.add(name(addr));
}
return result;
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
index a6170b4d498..2ee42827ef2 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java
@@ -185,9 +185,9 @@ public class TcpDiscoveryVmIpFinder extends TcpDiscoveryIpFinderAdapter {
Collection<InetSocketAddress> col = new LinkedHashSet<>();
try {
- InetAddress[] inetAddresses = InetAddress.getAllByName(ipStr);
+ InetAddress[] inetAddrs = InetAddress.getAllByName(ipStr);
- for (InetAddress addrs : inetAddresses)
+ for (InetAddress addrs : inetAddrs)
col.add(new InetSocketAddress(addrs, 0));
}
catch (UnknownHostException ignored) {
@@ -230,10 +230,10 @@ public class TcpDiscoveryVmIpFinder extends TcpDiscoveryIpFinderAdapter {
try {
Collection<InetSocketAddress> res = new ArrayList<>();
- InetAddress[] inetAddresses;
+ InetAddress[] inetAddrs;
try {
- inetAddresses = InetAddress.getAllByName(addrStr);
+ inetAddrs = InetAddress.getAllByName(addrStr);
}
catch (UnknownHostException e) {
// Ignore
@@ -243,7 +243,7 @@ public class TcpDiscoveryVmIpFinder extends TcpDiscoveryIpFinderAdapter {
return res;
}
- for (InetAddress curAddr : inetAddresses) {
+ for (InetAddress curAddr : inetAddrs) {
// Upper bound included.
for (int i = port1; i <= port2; i++)
res.add(new InetSocketAddress(curAddr, i));
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilterSelfTest.java
index 91f18d324ed..8212419d4de 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilterSelfTest.java
@@ -37,11 +37,11 @@ public class ClusterNodeAttributeAffinityBackupFilterSelfTest extends AffinityFu
@Override protected AffinityFunction affinityFunctionWithAffinityBackupFilter(String attributeName) {
RendezvousAffinityFunction aff = new RendezvousAffinityFunction(false);
- String[] stringArray = new String[1];
+ String[] stringArr = new String[1];
- stringArray[0] = attributeName;
+ stringArr[0] = attributeName;
- aff.setAffinityBackupFilter(new ClusterNodeAttributeAffinityBackupFilter(stringArray));
+ aff.setAffinityBackupFilter(new ClusterNodeAttributeAffinityBackupFilter(stringArr));
return aff;
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ReliableChannelTest.java b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ReliableChannelTest.java
index 6bed312375a..7738fa0f91a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ReliableChannelTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ReliableChannelTest.java
@@ -146,7 +146,7 @@ public class ReliableChannelTest {
ClientConfiguration ccfg = new ClientConfiguration().setAddressesFinder(finder);
ReliableChannel rc = new ReliableChannel(chFactory, ccfg, null);
- Supplier<List<String>> holderAddresses = () -> rc.getChannelHolders().stream()
+ Supplier<List<String>> holderAddrs = () -> rc.getChannelHolders().stream()
.map(h -> F.first(h.getAddresses()).toString().replace("/<unresolved>", "")) // Replace unnecessary part on JDK 17.
.sorted()
.collect(Collectors.toList());
@@ -154,7 +154,7 @@ public class ReliableChannelTest {
Consumer<List<String>> assertAddrReInitAndEqualsTo = (addrs) -> {
rc.channelsInit();
- assertEquals(addrs, holderAddresses.get());
+ assertEquals(addrs, holderAddrs.get());
};
assertAddrReInitAndEqualsTo.accept(Arrays.asList("127.0.0.1:10800", "127.0.0.1:10801", "127.0.0.1:10802"));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
index 575cd1b9809..c1bf64b46d7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
@@ -1124,9 +1124,9 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
*/
@Test
public void testInet6Address() throws Exception {
- final InetAddress address = Inet6Address.getByAddress(new byte[16]);
+ final InetAddress addr = Inet6Address.getByAddress(new byte[16]);
- assertEquals(address, marshalUnmarshal(address));
+ assertEquals(addr, marshalUnmarshal(addr));
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
index d2be385f61a..530e8458270 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
@@ -123,9 +123,9 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
cfg.setBinaryConfiguration(binCfg);
- CacheKeyConfiguration arrayHashCfg = new CacheKeyConfiguration("ArrayHashedKey", "fld1");
+ CacheKeyConfiguration arrHashCfg = new CacheKeyConfiguration("ArrayHashedKey", "fld1");
- cfg.setCacheKeyConfiguration(arrayHashCfg);
+ cfg.setCacheKeyConfiguration(arrHashCfg);
GridCacheBinaryObjectsAbstractSelfTest.cfg = cfg;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/FileDownloaderTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/FileDownloaderTest.java
index 907b4ce89d0..cbe39962453 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/FileDownloaderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/FileDownloaderTest.java
@@ -82,7 +82,7 @@ public class FileDownloaderTest extends GridCommonAbstractTest {
FileDownloader downloader = new FileDownloader(log, DOWNLOADER_PATH);
- InetSocketAddress address = downloader.start();
+ InetSocketAddress addr = downloader.start();
GridFutureAdapter<Long> finishFut = new GridFutureAdapter<>();
@@ -91,10 +91,10 @@ public class FileDownloaderTest extends GridCommonAbstractTest {
SocketChannel sc = null;
try {
- sc = SocketChannel.open(address);
+ sc = SocketChannel.open(addr);
}
catch (IOException e) {
- U.warn(log, "Fail connect to " + address, e);
+ U.warn(log, "Fail connect to " + addr, e);
}
runAsync(downloader::download);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImplTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImplTest.java
index c71f81b4c29..a0bb276890d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImplTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImplTest.java
@@ -536,13 +536,13 @@ public class PageMemoryImplTest extends GridCommonAbstractTest {
private void acquireAndReleaseWriteLock(PageMemoryImpl memory, FullPageId fullPageId) throws IgniteCheckedException {
long page = memory.acquirePage(1, fullPageId.pageId());
- long address = memory.writeLock(1, fullPageId.pageId(), page);
+ long addr = memory.writeLock(1, fullPageId.pageId(), page);
- PageIO.setPageId(address, fullPageId.pageId());
+ PageIO.setPageId(addr, fullPageId.pageId());
- PageIO.setType(address, PageIO.T_BPLUS_META);
+ PageIO.setType(addr, PageIO.T_BPLUS_META);
- PageUtils.putShort(address, PageIO.VER_OFF, (short)1);
+ PageUtils.putShort(addr, PageIO.VER_OFF, (short)1);
memory.writeUnlock(1, fullPageId.pageId(), page, Boolean.FALSE, true);
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 14913482dee..552b9954ea4 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
@@ -768,9 +768,9 @@ public class IgniteUtilsSelfTest extends GridCommonAbstractTest {
*/
@Test
public void testResolveLocalAddresses() throws Exception {
- InetAddress inetAddress = InetAddress.getByName("0.0.0.0");
+ InetAddress inetAddr = InetAddress.getByName("0.0.0.0");
- IgniteBiTuple<Collection<String>, Collection<String>> addrs = U.resolveLocalAddresses(inetAddress);
+ IgniteBiTuple<Collection<String>, Collection<String>> addrs = U.resolveLocalAddresses(inetAddr);
Collection<String> hostNames = addrs.get2();
@@ -1589,18 +1589,18 @@ public class IgniteUtilsSelfTest extends GridCommonAbstractTest {
boolean ignoreLocalHostname = IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_IGNORE_LOCAL_HOST_NAME);
String userDefinedHost = IgniteSystemProperties.getString(IgniteSystemProperties.IGNITE_LOCAL_HOST);
- InetSocketAddress inetSocketAddress = new InetSocketAddress(userDefinedHost, 0);
- InetAddress addr = inetSocketAddress.getAddress();
- IgniteBiTuple<Collection<String>, Collection<String>> localAddresses = IgniteUtils.resolveLocalAddresses(addr);
+ InetSocketAddress inetSocketAddr = new InetSocketAddress(userDefinedHost, 0);
+ InetAddress addr = inetSocketAddr.getAddress();
+ IgniteBiTuple<Collection<String>, Collection<String>> localAddrs = IgniteUtils.resolveLocalAddresses(addr);
if (ignoreLocalHostname) {
// If local hostname is ignored, then no hostname should be resolved.
- assertTrue(localAddresses.get2().isEmpty());
+ assertTrue(localAddrs.get2().isEmpty());
}
else {
// If local hostname is not ignored, then we should receive example.com.
- assertFalse(localAddresses.get2().isEmpty());
- assertEquals("example.com", F.first(localAddresses.get2()));
+ assertFalse(localAddrs.get2().isEmpty());
+ assertEquals("example.com", F.first(localAddrs.get2()));
}
}
finally {
diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridLongListSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridLongListSelfTest.java
index 1b3153be7b5..2651a30526b 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/GridLongListSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/GridLongListSelfTest.java
@@ -175,21 +175,21 @@ public class GridLongListSelfTest {
public void testArray() {
GridLongList list = new GridLongList();
- long[] array = list.array();
+ long[] arr = list.array();
- assertNotNull(array);
+ assertNotNull(arr);
- assertEquals(0, array.length);
+ assertEquals(0, arr.length);
list.add(1L);
- array = list.array();
+ arr = list.array();
- assertNotNull(array);
+ assertNotNull(arr);
- assertEquals(1, array.length);
+ assertEquals(1, arr.length);
- assertEquals(1L, array[0]);
+ assertEquals(1L, arr[0]);
}
/** */
diff --git a/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverterArguments.java b/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverterArguments.java
index ec4c5a8d2fa..bc30d2ae7ce 100644
--- a/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverterArguments.java
+++ b/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverterArguments.java
@@ -406,11 +406,11 @@ public class IgniteWalConverterArguments {
else if (arg.startsWith(RECORD_TYPES + "=")) {
final String recordTypesStr = arg.substring(RECORD_TYPES.length() + 1);
- final String[] recordTypesStrArray = recordTypesStr.split(",");
+ final String[] recordTypesStrArr = recordTypesStr.split(",");
final SortedSet<String> unknownRecordTypes = new TreeSet<>();
- for (String recordTypeStr : recordTypesStrArray) {
+ for (String recordTypeStr : recordTypesStrArr) {
try {
recordTypes.add(WALRecord.RecordType.valueOf(recordTypeStr));
}
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
index 06980a4407a..6c654eca0b3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
@@ -1118,7 +1118,7 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest {
@Test
public void testMetastorageLargeArray() throws Exception {
int cnt = 5000;
- int arraySize = 32_768;
+ int arrSize = 32_768;
IgniteEx ignite = (IgniteEx)startGrid("node1");
@@ -1129,8 +1129,8 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest {
MetaStorage storage = sharedCtx.database().metaStorage();
for (int i = 0; i < cnt; i++) {
- byte[] b1 = new byte[arraySize];
- for (int k = 0; k < arraySize; k++) {
+ byte[] b1 = new byte[arrSize];
+ for (int k = 0; k < arrSize; k++) {
b1[k] = (byte)(k % 100);
}
@@ -1146,9 +1146,9 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest {
for (int i = 0; i < cnt; i++) {
byte[] d2 = storage.readRaw(String.valueOf(i));
- assertEquals(arraySize, d2.length);
+ assertEquals(arrSize, d2.length);
- for (int k = 0; k < arraySize; k++) {
+ for (int k = 0; k < arrSize; k++) {
assertEquals((byte)(k % 100), d2[k]);
}
}
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/WrongQueryEntityFieldTypeTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/WrongQueryEntityFieldTypeTest.java
index cb0c32cddac..b49ff838c1d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/WrongQueryEntityFieldTypeTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/WrongQueryEntityFieldTypeTest.java
@@ -224,11 +224,11 @@ public class WrongQueryEntityFieldTypeTest extends GridCommonAbstractTest {
Class<?> organization = ldr.loadClass("org.apache.ignite.tests.p2p.cache.Organization");
Class<?> person = ldr.loadClass("org.apache.ignite.tests.p2p.cache.Person");
- Class<?> address = ldr.loadClass("org.apache.ignite.tests.p2p.cache.Address");
+ Class<?> addr = ldr.loadClass("org.apache.ignite.tests.p2p.cache.Address");
Object p = person.getConstructor(String.class).newInstance("test");
- return organization.getConstructor(String.class, person, address).newInstance("org", p, null);
+ return organization.getConstructor(String.class, person, addr).newInstance("org", p, null);
}
catch (Exception e) {
throw new RuntimeException(e);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/IgniteCachePartitionedAtomicColumnConstraintsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/IgniteCachePartitionedAtomicColumnConstraintsTest.java
index 44ce5101669..9a7683df759 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/IgniteCachePartitionedAtomicColumnConstraintsTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/IgniteCachePartitionedAtomicColumnConstraintsTest.java
@@ -109,16 +109,16 @@ public class IgniteCachePartitionedAtomicColumnConstraintsTest extends AbstractI
jcache(grid(0), cacheConfiguration(new QueryEntity(String.class.getName(), String.class.getName())
.setFieldsPrecision(strStrPrecision)), STR_CACHE_NAME);
- Map<String, Integer> orgAddressPrecision = new HashMap<>();
+ Map<String, Integer> orgAddrPrecision = new HashMap<>();
- orgAddressPrecision.put("name", 5);
- orgAddressPrecision.put("address", 5);
+ orgAddrPrecision.put("name", 5);
+ orgAddrPrecision.put("address", 5);
jcache(grid(0), cacheConfiguration(new QueryEntity(Organization.class.getName(), Address.class.getName())
.setKeyFields(Collections.singleton("name"))
.addQueryField("name", "java.lang.String", "name")
.addQueryField("address", "java.lang.String", "address")
- .setFieldsPrecision(orgAddressPrecision)), OBJ_CACHE_NAME);
+ .setFieldsPrecision(orgAddrPrecision)), OBJ_CACHE_NAME);
Map<String, Integer> strOrgPrecision = new HashMap<>();
diff --git a/modules/indexing/src/test/java/org/apache/ignite/sqltests/BaseSqlTest.java b/modules/indexing/src/test/java/org/apache/ignite/sqltests/BaseSqlTest.java
index 1453e0c0cc3..6a04368cb4f 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/sqltests/BaseSqlTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/sqltests/BaseSqlTest.java
@@ -150,9 +150,9 @@ public class BaseSqlTest extends AbstractIndexingCommonTest {
if (addrId < FREE_ADDR_CNT)
depId = null;
- String address = UUID.randomUUID().toString();
+ String addr = UUID.randomUUID().toString();
- execute(insConf.setArgs(addrId, depId, depId, address));
+ execute(insConf.setArgs(addrId, depId, depId, addr));
}
}
diff --git a/modules/kubernetes/src/main/java/org/apache/ignite/internal/kubernetes/connection/KubernetesServiceAddressResolver.java b/modules/kubernetes/src/main/java/org/apache/ignite/internal/kubernetes/connection/KubernetesServiceAddressResolver.java
index fb0a2287c53..957b87c0d29 100644
--- a/modules/kubernetes/src/main/java/org/apache/ignite/internal/kubernetes/connection/KubernetesServiceAddressResolver.java
+++ b/modules/kubernetes/src/main/java/org/apache/ignite/internal/kubernetes/connection/KubernetesServiceAddressResolver.java
@@ -170,9 +170,9 @@ public class KubernetesServiceAddressResolver {
private Collection<InetAddress> parseAddresses(List<Address> addresses) {
Collection<InetAddress> addrs = new ArrayList<>();
if (addresses != null && !addresses.isEmpty()) {
- for (Address address : addresses) {
+ for (Address addr : addresses) {
try {
- addrs.add(InetAddress.getByName(address.ip));
+ addrs.add(InetAddress.getByName(addr.ip));
}
catch (UnknownHostException ignore) {
throw new IgniteException("Kubernetes Address is not valid IP address");
diff --git a/parent/pom.xml b/parent/pom.xml
index d087b8d6c4f..b8657075cc9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -687,9 +687,16 @@
<goals>
<goal>check</goal>
</goals>
- <phase>validate</phase>
+ <phase>compile</phase>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-checkstyle</artifactId>
+ <version>${revision}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>