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 2018/10/17 10:40:17 UTC
[2/2] ignite git commit: IGNITE-9652: fix missorted modifiers - Fixes
#4800.
IGNITE-9652: fix missorted modifiers - Fixes #4800.
Signed-off-by: Nikolay Izhikov <ni...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d829b67e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d829b67e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d829b67e
Branch: refs/heads/master
Commit: d829b67e9de85809d23c07791ca88011fe1a7318
Parents: 8130e89
Author: Maxim Muzafarov <ma...@gmail.com>
Authored: Wed Oct 17 13:30:50 2018 +0300
Committer: Nikolay Izhikov <ni...@apache.org>
Committed: Wed Oct 17 13:30:50 2018 +0300
----------------------------------------------------------------------
.../spi/checkpoint/s3/S3CheckpointSpi.java | 8 +--
.../jmh/notify/JmhWaitStategyBenchmark.java | 4 +-
.../jdbc2/JdbcDynamicIndexAbstractSelfTest.java | 8 +--
...ThinTransactionsAbstractComplexSelfTest.java | 4 +-
.../cloud/TcpDiscoveryCloudIpFinder.java | 2 +-
.../internal/IgniteDiagnosticMessage.java | 8 +--
.../IgniteDiagnosticPrepareContext.java | 2 +-
.../internal/binary/BinaryFieldAccessor.java | 2 +-
.../internal/binary/BinaryReaderHandles.java | 2 +-
.../commandline/cache/CacheArguments.java | 2 +-
.../internal/jdbc/thin/JdbcThinConnection.java | 2 +-
.../internal/jdbc/thin/JdbcThinSSLUtil.java | 2 +-
.../CacheDefaultBinaryAffinityKeyMapper.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../cache/GridCacheSharedContext.java | 2 +-
.../processors/cache/GridCacheUtils.java | 2 +-
.../processors/cache/QueryCursorImpl.java | 2 +-
.../distributed/GridDistributedCacheEntry.java | 2 +-
.../cache/distributed/near/GridNearTxLocal.java | 2 +-
.../cache/local/GridLocalLockFuture.java | 2 +-
.../cache/mvcc/MvccProcessorImpl.java | 2 +-
.../cache/persistence/DbCheckpointListener.java | 2 +-
.../wal/SegmentedRingByteBuffer.java | 4 +-
.../persistence/wal/crc/PureJavaCrc32.java | 2 +-
.../cache/query/IgniteQueryErrorCode.java | 58 ++++++++++----------
.../CacheContinuousQueryPartitionRecovery.java | 2 +-
.../processors/cluster/GridUpdateNotifier.java | 4 +-
.../continuous/GridContinuousProcessor.java | 2 +-
.../internal/processors/hadoop/HadoopJobEx.java | 20 +++----
.../processors/igfs/IgfsMetaManager.java | 6 +-
.../internal/processors/odbc/SqlStateCode.java | 30 +++++-----
.../odbc/jdbc/JdbcRequestHandlerWorker.java | 2 +-
.../odbc/odbc/OdbcRequestHandlerWorker.java | 2 +-
.../dotnet/PlatformDotNetCacheStore.java | 2 +-
.../internal/processors/query/NestedTxMode.java | 2 +-
.../internal/processors/query/QueryUtils.java | 2 +-
.../protocols/tcp/redis/GridRedisMessage.java | 2 +-
.../processors/security/SecurityUtils.java | 2 +-
.../sql/command/SqlCreateIndexCommand.java | 2 +-
.../sql/command/SqlSetStreamingCommand.java | 2 +-
.../ignite/internal/util/StripedExecutor.java | 2 +-
.../ignite/internal/visor/tx/VisorTxInfo.java | 4 +-
.../internal/visor/tx/VisorTxTaskArg.java | 18 +++---
.../visor/verify/VisorViewCacheTaskArg.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
.../apache/ignite/transactions/Transaction.java | 2 +-
.../core/src/main/java/org/mindrot/BCrypt.java | 6 +-
...reSessionListenerWriteBehindEnabledTest.java | 4 +-
.../IgniteClientReconnectApiExceptionTest.java | 2 +-
.../cache/CacheGetEntryAbstractTest.java | 4 +-
.../cache/GridCacheAbstractSelfTest.java | 2 +-
...GridCacheConcurrentGetCacheOnClientTest.java | 2 +-
.../processors/cache/MapCacheStoreStrategy.java | 8 +--
.../GridCacheBinaryObjectsAbstractSelfTest.java | 2 +-
.../IgniteOptimisticTxSuspendResumeTest.java | 6 +-
.../near/GridCacheNearClientHitTest.java | 4 +-
.../GridCacheRebalancingOrderingTest.java | 2 +-
.../mvcc/CacheMvccAbstractFeatureTest.java | 2 +-
.../mvcc/CacheMvccOperationChecksTest.java | 4 +-
.../db/wal/WalDeletionArchiveAbstractTest.java | 2 +-
.../CacheContinuousQueryLostPartitionTest.java | 2 +-
.../CacheContinuousQueryOperationP2PTest.java | 2 +-
...eContinuousQueryMultiNodesFilteringTest.java | 8 +--
...IgniteCacheContinuousQueryReconnectTest.java | 2 +-
.../IgniteDbMemoryLeakLargeObjectsTest.java | 2 +-
...gfsSecondaryFileSystemInjectionSelfTest.java | 2 +-
.../GridServiceProxyNodeStopSelfTest.java | 2 +-
...unicationSpiTcpFailureDetectionSelfTest.java | 2 +-
.../tcp/TcpCommunicationStatisticsTest.java | 4 +-
...lientDiscoverySpiFailureTimeoutSelfTest.java | 4 +-
.../tcp/TcpDiscoveryWithWrongServerTest.java | 4 +-
.../stream/socket/SocketStreamerSelfTest.java | 2 +-
.../multijvm/IgniteCacheProcessProxy.java | 2 +-
.../apache/ignite/stream/flume/IgniteSink.java | 4 +-
.../ignite/stream/flume/IgniteSinkTest.java | 2 +-
.../gce/TcpDiscoveryGoogleStorageIpFinder.java | 2 +-
.../hadoop/impl/igfs/HadoopIgfsInProc.java | 4 +-
.../hadoop/impl/igfs/HadoopIgfsOutProc.java | 2 +-
.../query/h2/PreparedStatementExImpl.java | 6 +-
.../processors/query/h2/UpdateResult.java | 3 +-
.../processors/query/h2/dml/DmlArguments.java | 2 +-
.../query/h2/dml/UpdatePlanBuilder.java | 2 +-
.../processors/query/h2/sql/GridSqlKeyword.java | 2 +-
...niteCacheAbstractInsertSqlQuerySelfTest.java | 4 +-
.../cache/SqlFieldsQuerySelfTest.java | 2 +-
.../cache/index/DynamicColumnsAbstractTest.java | 6 +-
.../H2DynamicColumnsAbstractBasicSelfTest.java | 10 ++--
.../index/H2DynamicIndexAbstractSelfTest.java | 2 +-
.../H2DynamicIndexingComplexAbstractTest.java | 8 +--
...sactionsCommandsWithMvccEnabledSelfTest.java | 4 +-
.../cache/index/SqlTransactionsSelfTest.java | 4 +-
.../query/IgniteCachelessQueriesSelfTest.java | 2 +-
.../org/apache/ignite/sqltests/BaseSqlTest.java | 14 ++---
.../ignite/stream/kafka/KafkaStreamer.java | 2 +-
.../ignite/mesos/resource/IgniteProvider.java | 2 +-
.../main/java/org/apache/ignite/ml/Model.java | 2 +-
.../org/apache/ignite/ml/dataset/Dataset.java | 22 ++++----
.../ml/dataset/PartitionContextBuilder.java | 2 +-
.../ignite/ml/dataset/PartitionDataBuilder.java | 2 +-
.../ml/environment/logging/NoOpLogger.java | 2 +-
.../java/org/apache/ignite/ml/math/Blas.java | 4 +-
.../java/org/apache/ignite/ml/math/Tracer.java | 12 ++--
.../math/primitives/matrix/MatrixStorage.java | 2 +-
.../RPropUpdateCalculator.java | 4 +-
.../ml/tree/impurity/ImpurityMeasure.java | 2 +-
.../impurity/util/StepFunctionCompressor.java | 2 +-
.../vector/VectorImplementationsFixtures.java | 2 +-
.../ignite/cache/websession/WebSession.java | 2 +-
.../ignite/cache/websession/WebSessionV2.java | 2 +-
.../ZookeeperDiscoverySpiAbstractTestSuite.java | 2 +-
110 files changed, 242 insertions(+), 241 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
index 8ea5ef7..36be4fd 100644
--- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
+++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
@@ -158,10 +158,10 @@ public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi {
private String bucketName;
/** Bucket endpoint (set by user). */
- private @Nullable String bucketEndpoint;
+ @Nullable private String bucketEndpoint;
/** Server side encryption algorithm */
- private @Nullable String sseAlg;
+ @Nullable private String sseAlg;
/** Amazon client configuration. */
private ClientConfiguration cfg;
@@ -187,7 +187,7 @@ public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi {
*
* @return S3 bucket endpoint to use.
*/
- public @Nullable String getBucketEndpoint() {
+ @Nullable public String getBucketEndpoint() {
return bucketEndpoint;
}
@@ -196,7 +196,7 @@ public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi {
*
* @return S3 server-side encryption algorithm to use.
*/
- public @Nullable String getSSEAlgorithm() {
+ @Nullable public String getSSEAlgorithm() {
return sseAlg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/notify/JmhWaitStategyBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/notify/JmhWaitStategyBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/notify/JmhWaitStategyBenchmark.java
index d44c53f..b08d98e 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/notify/JmhWaitStategyBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/notify/JmhWaitStategyBenchmark.java
@@ -142,14 +142,14 @@ public class JmhWaitStategyBenchmark extends JmhCacheAbstractBenchmark {
};
/** Decreasing policy factory. */
- private final static Factory<ExpiryPolicy> DECREASING_POLICY_FACTORY = new Factory<ExpiryPolicy>() {
+ private static final Factory<ExpiryPolicy> DECREASING_POLICY_FACTORY = new Factory<ExpiryPolicy>() {
@Override public ExpiryPolicy create() {
return DECREASING_EXPIRY_POLICY;
}
};
/** Increasing policy factory. */
- private final static Factory<ExpiryPolicy> INCREASING_POLICY_FACTORY = new Factory<ExpiryPolicy>() {
+ private static final Factory<ExpiryPolicy> INCREASING_POLICY_FACTORY = new Factory<ExpiryPolicy>() {
@Override public ExpiryPolicy create() {
return INCREASING_EXPIRY_POLICY;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDynamicIndexAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDynamicIndexAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDynamicIndexAbstractSelfTest.java
index 9485d0d..13efcdf 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDynamicIndexAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDynamicIndexAbstractSelfTest.java
@@ -37,16 +37,16 @@ import org.apache.ignite.internal.util.typedef.F;
*/
public abstract class JdbcDynamicIndexAbstractSelfTest extends JdbcAbstractDmlStatementSelfTest {
/** */
- private final static String CREATE_INDEX = "create index idx on Person (id desc)";
+ private static final String CREATE_INDEX = "create index idx on Person (id desc)";
/** */
- private final static String DROP_INDEX = "drop index idx";
+ private static final String DROP_INDEX = "drop index idx";
/** */
- private final static String CREATE_INDEX_IF_NOT_EXISTS = "create index if not exists idx on Person (id desc)";
+ private static final String CREATE_INDEX_IF_NOT_EXISTS = "create index if not exists idx on Person (id desc)";
/** */
- private final static String DROP_INDEX_IF_EXISTS = "drop index idx if exists";
+ private static final String DROP_INDEX_IF_EXISTS = "drop index idx if exists";
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTransactionsAbstractComplexSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTransactionsAbstractComplexSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTransactionsAbstractComplexSelfTest.java
index a175568..4a1b02c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTransactionsAbstractComplexSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTransactionsAbstractComplexSelfTest.java
@@ -50,7 +50,7 @@ import org.apache.ignite.testframework.GridTestUtils;
*/
public abstract class JdbcThinTransactionsAbstractComplexSelfTest extends JdbcThinAbstractSelfTest {
/** Client node index. */
- final static int CLI_IDX = 1;
+ static final int CLI_IDX = 1;
/**
* Closure to perform ordinary delete after repeatable read.
@@ -1016,7 +1016,7 @@ public abstract class JdbcThinTransactionsAbstractComplexSelfTest extends JdbcTh
/**
* Person class.
*/
- private final static class Person {
+ private static final class Person {
/** */
@QuerySqlField
public int id;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinder.java b/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinder.java
index 1aa3790..161cac3 100644
--- a/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinder.java
+++ b/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinder.java
@@ -135,7 +135,7 @@ import org.jclouds.location.reference.LocationConstants;
*/
public class TcpDiscoveryCloudIpFinder extends TcpDiscoveryIpFinderAdapter {
/* JCloud default connection timeout. */
- private final static String JCLOUD_CONNECTION_TIMEOUT = "10000"; //10 secs
+ private static final String JCLOUD_CONNECTION_TIMEOUT = "10000"; //10 secs
/* Cloud provider. */
private String provider;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java
index 8739c0e..2b11806 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java
@@ -240,7 +240,7 @@ public class IgniteDiagnosticMessage implements Message {
/**
*
*/
- public static abstract class DiagnosticBaseClosure implements IgniteBiInClosure<StringBuilder, GridKernalContext> {
+ public abstract static class DiagnosticBaseClosure implements IgniteBiInClosure<StringBuilder, GridKernalContext> {
/**
* @return Key to group similar messages.
*/
@@ -259,7 +259,7 @@ public class IgniteDiagnosticMessage implements Message {
/**
*
*/
- public final static class TxEntriesInfoClosure extends DiagnosticBaseClosure {
+ public static final class TxEntriesInfoClosure extends DiagnosticBaseClosure {
/** */
private static final long serialVersionUID = 0L;
@@ -343,7 +343,7 @@ public class IgniteDiagnosticMessage implements Message {
/**
*
*/
- public final static class ExchangeInfoClosure extends DiagnosticBaseClosure {
+ public static final class ExchangeInfoClosure extends DiagnosticBaseClosure {
/** */
private static final long serialVersionUID = 0L;
@@ -383,7 +383,7 @@ public class IgniteDiagnosticMessage implements Message {
/**
*
*/
- public final static class TxInfoClosure extends DiagnosticBaseClosure {
+ public static final class TxInfoClosure extends DiagnosticBaseClosure {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticPrepareContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticPrepareContext.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticPrepareContext.java
index ed8d35e..c5d08b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticPrepareContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticPrepareContext.java
@@ -160,7 +160,7 @@ public class IgniteDiagnosticPrepareContext {
/**
*
*/
- private final static class CompoundInfoClosure implements IgniteClosure<GridKernalContext, IgniteDiagnosticInfo> {
+ private static final class CompoundInfoClosure implements IgniteClosure<GridKernalContext, IgniteDiagnosticInfo> {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
index 7d138a3..29f6ef0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
@@ -207,7 +207,7 @@ public abstract class BinaryFieldAccessor {
/**
* Base primitive field accessor.
*/
- private static abstract class AbstractPrimitiveAccessor extends BinaryFieldAccessor {
+ private abstract static class AbstractPrimitiveAccessor extends BinaryFieldAccessor {
/** Offset. */
protected final long offset;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderHandles.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderHandles.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderHandles.java
index 881060f..27a9918 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderHandles.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderHandles.java
@@ -51,7 +51,7 @@ public class BinaryReaderHandles {
* @return Object.
*/
@SuppressWarnings("unchecked")
- public @Nullable <T> T get(int pos) {
+ @Nullable public <T> T get(int pos) {
switch (mode) {
case MODE_EMPTY:
return null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheArguments.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheArguments.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheArguments.java
index 97d234a..cec5e6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheArguments.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheArguments.java
@@ -53,7 +53,7 @@ public class CacheArguments {
private int checkThrough = -1;
/** Cache view command. */
- private @Nullable VisorViewCacheCmd cacheCmd;
+ @Nullable private VisorViewCacheCmd cacheCmd;
/** Calculate partition hash and print into standard output. */
private boolean dump;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
index d92948c..6878c8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
@@ -76,7 +76,7 @@ public class JdbcThinConnection implements Connection {
private static final Logger LOG = Logger.getLogger(JdbcThinConnection.class.getName());
/** Statements modification mutex. */
- final private Object stmtsMux = new Object();
+ private final Object stmtsMux = new Object();
/** Schema name. */
private String schema;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java
index a39c8cc..0c6666a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java
@@ -51,7 +51,7 @@ import org.apache.ignite.internal.util.typedef.F;
*/
public class JdbcThinSSLUtil {
/** Trust all certificates manager. */
- private final static X509TrustManager TRUST_ALL_MANAGER = new X509TrustManager() {
+ private static final X509TrustManager TRUST_ALL_MANAGER = new X509TrustManager() {
@Override public X509Certificate[] getAcceptedIssuers() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
index 385ed59..6bc2f90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
@@ -46,7 +46,7 @@ public class CacheDefaultBinaryAffinityKeyMapper extends GridCacheDefaultAffinit
private Map<String, String> typeNameAffFields = new HashMap<>();
/** Mapping from type ID to affinity field name. */
- private volatile transient Map<Integer, BinaryField> typeIdAffFields;
+ private transient volatile Map<Integer, BinaryField> typeIdAffFields;
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 3156d6d..9574d49 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -6322,7 +6322,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/**
* Delayed callable class.
*/
- public static abstract class TopologyVersionAwareJob extends ComputeJobAdapter {
+ public abstract static class TopologyVersionAwareJob extends ComputeJobAdapter {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 1f2f636..52d8525 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -584,7 +584,7 @@ public class GridCacheSharedContext<K, V> {
*
* @param cacheId Cache id.
*/
- public @Nullable CacheObjectContext cacheObjectContext(int cacheId) throws IgniteCheckedException {
+ @Nullable public CacheObjectContext cacheObjectContext(int cacheId) throws IgniteCheckedException {
GridCacheContext<K, V> ctx = ctxMap.get(cacheId);
if (ctx != null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index c316621..c5037c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1585,7 +1585,7 @@ public class GridCacheUtils {
/**
* @return default TX configuration if system cache is used or current grid TX config otherwise.
*/
- public static TransactionConfiguration transactionConfiguration(final @Nullable GridCacheContext sysCacheCtx,
+ public static TransactionConfiguration transactionConfiguration(@Nullable final GridCacheContext sysCacheCtx,
final IgniteConfiguration cfg) {
return sysCacheCtx != null && sysCacheCtx.systemTx()
? DEFAULT_TX_CFG
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
index 4fc1054..ccd98da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
@@ -41,7 +41,7 @@ import static org.apache.ignite.internal.processors.cache.QueryCursorImpl.State.
*/
public class QueryCursorImpl<T> implements QueryCursorEx<T>, FieldsQueryCursor<T> {
/** */
- private final static AtomicReferenceFieldUpdater<QueryCursorImpl, State> STATE_UPDATER =
+ private static final AtomicReferenceFieldUpdater<QueryCursorImpl, State> STATE_UPDATER =
AtomicReferenceFieldUpdater.newUpdater(QueryCursorImpl.class, State.class, "state");
/** Query executor. */
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
index ff636c7..96f0a55 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
@@ -727,7 +727,7 @@ public class GridDistributedCacheEntry extends GridCacheMapEntry {
}
/** {@inheritDoc} */
- @Override final protected void checkThreadChain(GridCacheMvccCandidate owner) {
+ @Override protected final void checkThreadChain(GridCacheMvccCandidate owner) {
assert !lockedByCurrentThread();
assert owner != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 68aa5c0..76d464e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -190,7 +190,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements GridTimeou
private TransactionProxyImpl rollbackOnlyProxy;
/** Tx label. */
- private @Nullable String lb;
+ @Nullable private String lb;
/** */
private MvccQueryTracker mvccTracker;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
index 18a8431..fb8c396 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
@@ -273,7 +273,7 @@ public final class GridLocalLockFuture<K, V> extends GridCacheFutureAdapter<Bool
* @return Lock candidate.
* @throws GridCacheEntryRemovedException If entry was removed.
*/
- private @Nullable GridCacheMvccCandidate addEntry(GridLocalCacheEntry entry)
+ @Nullable private GridCacheMvccCandidate addEntry(GridLocalCacheEntry entry)
throws GridCacheEntryRemovedException {
// Add local lock first, as it may throw GridCacheEntryRemovedException.
GridCacheMvccCandidate c = entry.addLocal(
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java
index d22c61d..f17c137 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java
@@ -1956,7 +1956,7 @@ public class MvccProcessorImpl extends GridProcessorAdapter implements MvccProce
*/
private static class VacuumScheduler extends GridWorker {
/** */
- private final static long VACUUM_TIMEOUT = 60_000;
+ private static final long VACUUM_TIMEOUT = 60_000;
/** */
private final long interval;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DbCheckpointListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DbCheckpointListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DbCheckpointListener.java
index 36ab163..d0158d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DbCheckpointListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DbCheckpointListener.java
@@ -49,7 +49,7 @@ public interface DbCheckpointListener {
/**
* @return Context executor.
*/
- public @Nullable Executor executor();
+ @Nullable public Executor executor();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SegmentedRingByteBuffer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SegmentedRingByteBuffer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SegmentedRingByteBuffer.java
index 7cfeb98..0f9c6b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SegmentedRingByteBuffer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SegmentedRingByteBuffer.java
@@ -456,14 +456,14 @@ public class SegmentedRingByteBuffer {
/**
* Releases segment.
*/
- abstract public void release();
+ public abstract void release();
/**
* Returns byte buffer.
*
* @return Byte buffer.
*/
- abstract public ByteBuffer buffer();
+ public abstract ByteBuffer buffer();
/**
* Returns position.
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/crc/PureJavaCrc32.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/crc/PureJavaCrc32.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/crc/PureJavaCrc32.java
index 6bd4a35..5e89a40 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/crc/PureJavaCrc32.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/crc/PureJavaCrc32.java
@@ -68,7 +68,7 @@ public class PureJavaCrc32 {
/**
* @param b B.
*/
- final public void update(int b) {
+ public final void update(int b) {
crc = (crc >>> 8) ^ T[(((crc ^ b) << 24) >>> 24)];
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/IgniteQueryErrorCode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/IgniteQueryErrorCode.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/IgniteQueryErrorCode.java
index f1a2355..fd017f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/IgniteQueryErrorCode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/IgniteQueryErrorCode.java
@@ -27,101 +27,101 @@ import org.apache.ignite.internal.processors.odbc.SqlStateCode;
*/
public final class IgniteQueryErrorCode {
/** Unknown error, or the one without specific code. */
- public final static int UNKNOWN = 1;
+ public static final int UNKNOWN = 1;
/* 1xxx - parsing errors */
/** General parsing error - for the cases when there's no more specific code available. */
- public final static int PARSING = 1001;
+ public static final int PARSING = 1001;
/** Requested operation is not supported. */
- public final static int UNSUPPORTED_OPERATION = 1002;
+ public static final int UNSUPPORTED_OPERATION = 1002;
/* 2xxx - analysis errors */
/** Code encountered SQL statement of some type that it did not expect in current analysis context. */
- public final static int UNEXPECTED_OPERATION = 2001;
+ public static final int UNEXPECTED_OPERATION = 2001;
/** Code encountered SQL expression of some type that it did not expect in current analysis context. */
- public final static int UNEXPECTED_ELEMENT_TYPE = 2002;
+ public static final int UNEXPECTED_ELEMENT_TYPE = 2002;
/** Analysis detected that the statement is trying to directly {@code UPDATE} key or its fields. */
- public final static int KEY_UPDATE = 2003;
+ public static final int KEY_UPDATE = 2003;
/* 3xxx - database API related runtime errors */
/** Required table not found. */
- public final static int TABLE_NOT_FOUND = 3001;
+ public static final int TABLE_NOT_FOUND = 3001;
/** Required table does not have a descriptor set. */
- public final static int NULL_TABLE_DESCRIPTOR = 3002;
+ public static final int NULL_TABLE_DESCRIPTOR = 3002;
/** Statement type does not match that declared by JDBC driver. */
- public final static int STMT_TYPE_MISMATCH = 3003;
+ public static final int STMT_TYPE_MISMATCH = 3003;
/** DROP TABLE failed. */
- public final static int TABLE_DROP_FAILED = 3004;
+ public static final int TABLE_DROP_FAILED = 3004;
/** Index already exists. */
- public final static int INDEX_ALREADY_EXISTS = 3005;
+ public static final int INDEX_ALREADY_EXISTS = 3005;
/** Index does not exist. */
- public final static int INDEX_NOT_FOUND = 3006;
+ public static final int INDEX_NOT_FOUND = 3006;
/** Required table already exists. */
- public final static int TABLE_ALREADY_EXISTS = 3007;
+ public static final int TABLE_ALREADY_EXISTS = 3007;
/** Required column not found. */
- public final static int COLUMN_NOT_FOUND = 3008;
+ public static final int COLUMN_NOT_FOUND = 3008;
/** Required column already exists. */
- public final static int COLUMN_ALREADY_EXISTS = 3009;
+ public static final int COLUMN_ALREADY_EXISTS = 3009;
/** Conversion failure. */
- public final static int CONVERSION_FAILED = 3013;
+ public static final int CONVERSION_FAILED = 3013;
/* 4xxx - cache related runtime errors */
/** Attempt to INSERT a key that is already in cache. */
- public final static int DUPLICATE_KEY = 4001;
+ public static final int DUPLICATE_KEY = 4001;
/** Attempt to UPDATE or DELETE a key whose value has been updated concurrently by someone else. */
- public final static int CONCURRENT_UPDATE = 4002;
+ public static final int CONCURRENT_UPDATE = 4002;
/** Attempt to INSERT or MERGE {@code null} key. */
- public final static int NULL_KEY = 4003;
+ public static final int NULL_KEY = 4003;
/** Attempt to INSERT or MERGE {@code null} value, or to to set {@code null} to a {@code NOT NULL} column. */
- public final static int NULL_VALUE = 4004;
+ public static final int NULL_VALUE = 4004;
/** {@link EntryProcessor} has thrown an exception during {@link IgniteCache#invokeAll}. */
- public final static int ENTRY_PROCESSING = 4005;
+ public static final int ENTRY_PROCESSING = 4005;
/** Cache not found. */
- public final static int CACHE_NOT_FOUND = 4006;
+ public static final int CACHE_NOT_FOUND = 4006;
/** Attempt to INSERT, UPDATE or MERGE key that exceed maximum column length. */
- public final static int TOO_LONG_KEY = 4007;
+ public static final int TOO_LONG_KEY = 4007;
/** Attempt to INSERT, UPDATE or MERGE value that exceed maximum column length. */
- public final static int TOO_LONG_VALUE = 4008;
+ public static final int TOO_LONG_VALUE = 4008;
/* 5xxx - transactions related runtime errors. */
/** Transaction is already open. */
- public final static int TRANSACTION_EXISTS = 5001;
+ public static final int TRANSACTION_EXISTS = 5001;
/** MVCC disabled. */
- public final static int MVCC_DISABLED = 5002;
+ public static final int MVCC_DISABLED = 5002;
/** Transaction type mismatch (SQL/non SQL). */
- public final static int TRANSACTION_TYPE_MISMATCH = 5003;
+ public static final int TRANSACTION_TYPE_MISMATCH = 5003;
/** Transaction is already completed. */
- public final static int TRANSACTION_COMPLETED = 5004;
+ public static final int TRANSACTION_COMPLETED = 5004;
/** Transaction serialization error. */
- public final static int TRANSACTION_SERIALIZATION_ERROR = 5005;
+ public static final int TRANSACTION_SERIALIZATION_ERROR = 5005;
/** */
private IgniteQueryErrorCode() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryPartitionRecovery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryPartitionRecovery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryPartitionRecovery.java
index e210c24..b9eaf7b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryPartitionRecovery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryPartitionRecovery.java
@@ -47,7 +47,7 @@ class CacheContinuousQueryPartitionRecovery {
}
/** */
- private final static int MAX_BUFF_SIZE = CacheContinuousQueryHandler.LSNR_MAX_BUF_SIZE;
+ private static final int MAX_BUFF_SIZE = CacheContinuousQueryHandler.LSNR_MAX_BUF_SIZE;
/** */
private IgniteLogger log;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java
index ff834f6..70ec274 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java
@@ -48,10 +48,10 @@ class GridUpdateNotifier {
private static final int WORKER_THREAD_SLEEP_TIME = 5000;
/** Default URL for request Ignite updates. */
- private final static String DEFAULT_IGNITE_UPDATES_URL = "https://ignite.apache.org/latest";
+ private static final String DEFAULT_IGNITE_UPDATES_URL = "https://ignite.apache.org/latest";
/** Default HTTP parameter for request Ignite updates. */
- private final static String DEFAULT_IGNITE_UPDATES_PARAMS = "?ver=";
+ private static final String DEFAULT_IGNITE_UPDATES_PARAMS = "?ver=";
/** Grid version. */
private final String ver;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
index f95740e..4569f65 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
@@ -1594,7 +1594,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
private void sendMessageStartResult(final ClusterNode node,
final UUID routineId,
byte[] cntrsMapBytes,
- final @Nullable Exception err)
+ @Nullable final Exception err)
{
byte[] errBytes = null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobEx.java
index 46606da..04cd7c4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobEx.java
@@ -33,21 +33,21 @@ public abstract class HadoopJobEx implements HadoopJob {
*
* @return Job ID.
*/
- abstract public HadoopJobId id();
+ public abstract HadoopJobId id();
/**
* Gets job information.
*
* @return Job information.
*/
- abstract public HadoopJobInfo info();
+ public abstract HadoopJobInfo info();
/**
* Gets collection of input splits for this job.
*
* @return Input splits.
*/
- @Override abstract public Collection<HadoopInputSplit> input();
+ @Override public abstract Collection<HadoopInputSplit> input();
/**
* Returns context for task execution.
@@ -56,7 +56,7 @@ public abstract class HadoopJobEx implements HadoopJob {
* @return Task Context.
* @throws IgniteCheckedException If failed.
*/
- abstract public HadoopTaskContext getTaskContext(HadoopTaskInfo info) throws IgniteCheckedException;
+ public abstract HadoopTaskContext getTaskContext(HadoopTaskInfo info) throws IgniteCheckedException;
/**
* Does all the needed initialization for the job. Will be called on each node where tasks for this job must
@@ -69,7 +69,7 @@ public abstract class HadoopJobEx implements HadoopJob {
* @param locNodeId Local node ID.
* @throws IgniteCheckedException If failed.
*/
- abstract public void initialize(boolean external, UUID locNodeId) throws IgniteCheckedException;
+ public abstract void initialize(boolean external, UUID locNodeId) throws IgniteCheckedException;
/**
* Release all the resources.
@@ -80,7 +80,7 @@ public abstract class HadoopJobEx implements HadoopJob {
* @param external If {@code true} then this job instance resides in external process.
* @throws IgniteCheckedException If failed.
*/
- abstract public void dispose(boolean external) throws IgniteCheckedException;
+ public abstract void dispose(boolean external) throws IgniteCheckedException;
/**
* Prepare local environment for the task.
@@ -88,7 +88,7 @@ public abstract class HadoopJobEx implements HadoopJob {
* @param info Task info.
* @throws IgniteCheckedException If failed.
*/
- abstract public void prepareTaskEnvironment(HadoopTaskInfo info) throws IgniteCheckedException;
+ public abstract void prepareTaskEnvironment(HadoopTaskInfo info) throws IgniteCheckedException;
/**
* Cleans up local environment of the task.
@@ -96,17 +96,17 @@ public abstract class HadoopJobEx implements HadoopJob {
* @param info Task info.
* @throws IgniteCheckedException If failed.
*/
- abstract public void cleanupTaskEnvironment(HadoopTaskInfo info) throws IgniteCheckedException;
+ public abstract void cleanupTaskEnvironment(HadoopTaskInfo info) throws IgniteCheckedException;
/**
* Cleans up the job staging directory.
*/
- abstract public void cleanupStagingDirectory();
+ public abstract void cleanupStagingDirectory();
/**
* @return Ignite work directory.
*/
- abstract public String igniteWorkDirectory();
+ public abstract String igniteWorkDirectory();
/** {@inheritDoc} */
@Nullable @Override public String property(String name) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index e821b80..8ccab5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
@@ -588,7 +588,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return Locked file info or {@code null} if file cannot be locked or doesn't exist.
* @throws IgniteCheckedException If the file with such id does not exist, or on another failure.
*/
- public @Nullable IgfsEntryInfo lock(IgniteUuid fileId, boolean del) throws IgniteCheckedException {
+ @Nullable public IgfsEntryInfo lock(IgniteUuid fileId, boolean del) throws IgniteCheckedException {
if (busyLock.enterBusy()) {
try {
validTxState(false);
@@ -2896,7 +2896,7 @@ public class IgfsMetaManager extends IgfsManager {
Map<String, String> dirProps,
final boolean create,
final int blockSize,
- final @Nullable IgniteUuid affKey,
+ @Nullable final IgniteUuid affKey,
final boolean evictExclude,
@Nullable Map<String, String> fileProps) throws IgniteCheckedException {
validTxState(false);
@@ -2992,7 +2992,7 @@ public class IgfsMetaManager extends IgfsManager {
Map<String, String> dirProps,
final boolean overwrite,
final int blockSize,
- final @Nullable IgniteUuid affKey,
+ @Nullable final IgniteUuid affKey,
final boolean evictExclude,
@Nullable Map<String, String> fileProps,
@Nullable IgfsSecondaryFileSystemCreateContext secondaryCtx) throws IgniteCheckedException {
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlStateCode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlStateCode.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlStateCode.java
index 0b9423f..4778425 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlStateCode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlStateCode.java
@@ -29,47 +29,47 @@ public final class SqlStateCode {
}
/** Client has failed to open connection with specified server. */
- public final static String CLIENT_CONNECTION_FAILED = "08001";
+ public static final String CLIENT_CONNECTION_FAILED = "08001";
/** Connection unexpectedly turned out to be in closed state. */
- public final static String CONNECTION_CLOSED = "08003";
+ public static final String CONNECTION_CLOSED = "08003";
/** Connection was rejected by server. */
- public final static String CONNECTION_REJECTED = "08004";
+ public static final String CONNECTION_REJECTED = "08004";
/** IO error during communication. */
- public final static String CONNECTION_FAILURE = "08006";
+ public static final String CONNECTION_FAILURE = "08006";
/** Null value occurred where it wasn't expected to. */
- public final static String NULL_VALUE = "22004";
+ public static final String NULL_VALUE = "22004";
/** Parameter type is not supported. */
- public final static String INVALID_PARAMETER_VALUE = "22023";
+ public static final String INVALID_PARAMETER_VALUE = "22023";
/** Data integrity constraint violation. */
- public final static String CONSTRAINT_VIOLATION = "23000";
+ public static final String CONSTRAINT_VIOLATION = "23000";
/** Invalid result set state. */
- public final static String INVALID_CURSOR_STATE = "24000";
+ public static final String INVALID_CURSOR_STATE = "24000";
/** Conversion failure. */
- public final static String CONVERSION_FAILED = "0700B";
+ public static final String CONVERSION_FAILED = "0700B";
/** Invalid transaction level. */
- public final static String INVALID_TRANSACTION_LEVEL = "0700E";
+ public static final String INVALID_TRANSACTION_LEVEL = "0700E";
/** Requested operation is not supported. */
- public final static String UNSUPPORTED_OPERATION = "0A000";
+ public static final String UNSUPPORTED_OPERATION = "0A000";
/** Transaction state exception. */
- public final static String TRANSACTION_STATE_EXCEPTION = "25000";
+ public static final String TRANSACTION_STATE_EXCEPTION = "25000";
/** Transaction state exception. */
- public final static String SERIALIZATION_FAILURE = "40001";
+ public static final String SERIALIZATION_FAILURE = "40001";
/** Parsing exception. */
- public final static String PARSING_EXCEPTION = "42000";
+ public static final String PARSING_EXCEPTION = "42000";
/** Internal error. */
- public final static String INTERNAL_ERROR = "50000"; // Generic value for custom "50" class.
+ public static final String INTERNAL_ERROR = "50000"; // Generic value for custom "50" class.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandlerWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandlerWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandlerWorker.java
index 7211787..cac9081 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandlerWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandlerWorker.java
@@ -50,7 +50,7 @@ class JdbcRequestHandlerWorker extends GridWorker {
private final GridKernalContext ctx;
/** Response */
- private final static ClientListenerResponse ERR_RESPONSE = new JdbcResponse(IgniteQueryErrorCode.UNKNOWN,
+ private static final ClientListenerResponse ERR_RESPONSE = new JdbcResponse(IgniteQueryErrorCode.UNKNOWN,
"Connection closed.");
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandlerWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandlerWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandlerWorker.java
index 4184b6a..2168869 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandlerWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandlerWorker.java
@@ -50,7 +50,7 @@ class OdbcRequestHandlerWorker extends GridWorker {
private final GridKernalContext ctx;
/** Response */
- private final static ClientListenerResponse ERR_RESPONSE = new OdbcResponse(IgniteQueryErrorCode.UNKNOWN,
+ private static final ClientListenerResponse ERR_RESPONSE = new OdbcResponse(IgniteQueryErrorCode.UNKNOWN,
"Connection closed.");
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
index 173ce22..8ab98a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
@@ -228,7 +228,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
}
/** {@inheritDoc} */
- @Override public void loadCache(final IgniteBiInClosure<K, V> clo, final @Nullable Object... args) {
+ @Override public void loadCache(final IgniteBiInClosure<K, V> clo, @Nullable final Object... args) {
try {
doInvoke(new IgniteInClosureX<BinaryRawWriterEx>() {
@Override public void applyx(BinaryRawWriterEx writer) throws IgniteCheckedException {
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/query/NestedTxMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/NestedTxMode.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/NestedTxMode.java
index 3569003..7442306 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/NestedTxMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/NestedTxMode.java
@@ -33,7 +33,7 @@ public enum NestedTxMode {
ERROR;
/** Default handling mode. */
- public final static NestedTxMode DEFAULT = ERROR;
+ public static final NestedTxMode DEFAULT = ERROR;
/**
* Get enum value from int
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
index d977a49..e9420f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
@@ -377,7 +377,7 @@ public class QueryUtils {
* @param replace Whether to perform replace of special characters.
* @return Escaped string.
*/
- public static @Nullable String normalizeObjectName(@Nullable String str, boolean replace) {
+ @Nullable public static String normalizeObjectName(@Nullable String str, boolean replace) {
if (str == null)
return null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisMessage.java
index 2da9f99..72c57f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisMessage.java
@@ -49,7 +49,7 @@ public class GridRedisMessage implements GridClientMessage {
private static final int AUX_OFFSET = 2;
/** Request message parts. */
- private transient final List<String> msgParts;
+ private final transient List<String> msgParts;
/** Response. */
private ByteBuffer response;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java
index 1016335..1cd6719 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java
@@ -33,7 +33,7 @@ public class SecurityUtils {
public static final IgniteProductVersion SERVICE_PERMISSIONS_SINCE = IgniteProductVersion.fromString("1.7.11");
/** Default serialization version. */
- private final static int DFLT_SERIALIZE_VERSION = isSecurityCompatibilityMode() ? 1 : 2;
+ private static final int DFLT_SERIALIZE_VERSION = isSecurityCompatibilityMode() ? 1 : 2;
/** Current serialization version. */
private static final ThreadLocal<Integer> SERIALIZE_VERSION = new ThreadLocal<Integer>(){
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/sql/command/SqlCreateIndexCommand.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/sql/command/SqlCreateIndexCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/sql/command/SqlCreateIndexCommand.java
index 2f31973..7cec8e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/sql/command/SqlCreateIndexCommand.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/sql/command/SqlCreateIndexCommand.java
@@ -179,7 +179,7 @@ public class SqlCreateIndexCommand implements SqlCommand {
* @param lex Lexer.
* @return Index name.
*/
- private static @Nullable String parseIndexName(SqlLexer lex) {
+ @Nullable private static String parseIndexName(SqlLexer lex) {
if (matchesKeyword(lex.lookAhead(), ON))
return null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/sql/command/SqlSetStreamingCommand.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/sql/command/SqlSetStreamingCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/sql/command/SqlSetStreamingCommand.java
index 42f17d5..80ad9ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/sql/command/SqlSetStreamingCommand.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/sql/command/SqlSetStreamingCommand.java
@@ -33,7 +33,7 @@ import static org.apache.ignite.internal.sql.SqlParserUtils.parseInt;
*/
public class SqlSetStreamingCommand implements SqlCommand {
/** Default batch size for driver. */
- private final static int DFLT_STREAM_BATCH_SIZE = IgniteDataStreamer.DFLT_PER_NODE_BUFFER_SIZE * 4;
+ private static final int DFLT_STREAM_BATCH_SIZE = IgniteDataStreamer.DFLT_PER_NODE_BUFFER_SIZE * 4;
/** Whether streaming must be turned on or off by this command. */
private boolean turnOn;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
index 0ddb398..9853920 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
@@ -420,7 +420,7 @@ public class StripedExecutor implements ExecutorService {
/**
* Stripe.
*/
- private static abstract class Stripe extends GridWorker {
+ private abstract static class Stripe extends GridWorker {
/** */
private final String igniteInstanceName;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxInfo.java
index be60a5e..4068885 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxInfo.java
@@ -191,12 +191,12 @@ public class VisorTxInfo extends VisorDataTransferObject {
}
/** */
- public @Nullable IgniteUuid getNearXid() {
+ @Nullable public IgniteUuid getNearXid() {
return nearXid;
}
/** */
- public @Nullable Collection<UUID> getMasterNodeIds() {
+ @Nullable public Collection<UUID> getMasterNodeIds() {
return masterNodeIds;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxTaskArg.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxTaskArg.java
index 6f157e9..b1c6de0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxTaskArg.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxTaskArg.java
@@ -38,31 +38,31 @@ public class VisorTxTaskArg extends VisorDataTransferObject {
private VisorTxOperation op;
/** */
- private @Nullable Integer limit;
+ @Nullable private Integer limit;
/** */
- private @Nullable Long minDuration;
+ @Nullable private Long minDuration;
/** */
- private @Nullable Integer minSize;
+ @Nullable private Integer minSize;
/** */
- private @Nullable TransactionState state;
+ @Nullable private TransactionState state;
/** */
- private @Nullable VisorTxProjection proj;
+ @Nullable private VisorTxProjection proj;
/** */
- private @Nullable List<String> consistentIds;
+ @Nullable private List<String> consistentIds;
/** */
- private @Nullable String xid;
+ @Nullable private String xid;
/** */
- private @Nullable String lbRegex;
+ @Nullable private String lbRegex;
/** */
- private @Nullable VisorTxSortOrder sortOrder;
+ @Nullable private VisorTxSortOrder sortOrder;
/**
* Default constructor.
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorViewCacheTaskArg.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorViewCacheTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorViewCacheTaskArg.java
index 5fcd66d..a535e25 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorViewCacheTaskArg.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorViewCacheTaskArg.java
@@ -36,7 +36,7 @@ public class VisorViewCacheTaskArg extends VisorDataTransferObject {
private String regex;
/** Type. */
- private @Nullable VisorViewCacheCmd cmd;
+ @Nullable private VisorViewCacheCmd cmd;
/**
* @param regex Regex.
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 7b0ad53..1bdcc38 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -649,7 +649,7 @@ class ServerImpl extends TcpDiscoveryImpl {
* left a topology during the ping process.
* @throws IgniteCheckedException If an error occurs.
*/
- private @Nullable IgniteBiTuple<UUID, Boolean> pingNode(InetSocketAddress addr, @Nullable UUID nodeId,
+ @Nullable private IgniteBiTuple<UUID, Boolean> pingNode(InetSocketAddress addr, @Nullable UUID nodeId,
@Nullable UUID clientNodeId) throws IgniteCheckedException {
assert addr != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java b/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java
index a6856b8..e81867b 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java
@@ -297,5 +297,5 @@ public interface Transaction extends AutoCloseable, IgniteAsyncSupport {
*
* @return Label.
*/
- public @Nullable String label();
+ @Nullable public String label();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/main/java/org/mindrot/BCrypt.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/mindrot/BCrypt.java b/modules/core/src/main/java/org/mindrot/BCrypt.java
index f0817f1..903a056 100644
--- a/modules/core/src/main/java/org/mindrot/BCrypt.java
+++ b/modules/core/src/main/java/org/mindrot/BCrypt.java
@@ -341,13 +341,13 @@ public class BCrypt {
// bcrypt IV: "OrpheanBeholderScryDoubt". The C implementation calls
// this "ciphertext", but it is really plaintext or an IV. We keep
// the name to make code comparison easier.
- static private final int bf_crypt_ciphertext[] = {
+ private static final int bf_crypt_ciphertext[] = {
0x4f727068, 0x65616e42, 0x65686f6c,
0x64657253, 0x63727944, 0x6f756274
};
// Table for Base64 encoding
- static private final char base64_code[] = {
+ private static final char base64_code[] = {
'.', '/', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
@@ -357,7 +357,7 @@ public class BCrypt {
};
// Table for Base64 decoding
- static private final byte index_64[] = {
+ private static final byte index_64[] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerWriteBehindEnabledTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerWriteBehindEnabledTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerWriteBehindEnabledTest.java
index c9a912a..9314dbb 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerWriteBehindEnabledTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerWriteBehindEnabledTest.java
@@ -52,10 +52,10 @@ import org.apache.ignite.testframework.GridTestUtils;
*/
public class CacheStoreSessionListenerWriteBehindEnabledTest extends GridCacheAbstractSelfTest {
/** */
- protected final static int CNT = 100;
+ protected static final int CNT = 100;
/** */
- private final static int WRITE_BEHIND_FLUSH_FREQUENCY = 1000;
+ private static final int WRITE_BEHIND_FLUSH_FREQUENCY = 1000;
/** */
private static final List<OperationType> operations = Collections.synchronizedList(new ArrayList<OperationType>());
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
index 43da2d1..8f68a1f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
@@ -65,7 +65,7 @@ import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED;
public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnectAbstractTest {
/** Cache key for test put and invoke operation after reconnect */
- private final static int CACHE_PUT_INVOKE_KEY = 10010;
+ private static final int CACHE_PUT_INVOKE_KEY = 10010;
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java
index 6a7cfc6..1224c8e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java
@@ -73,13 +73,13 @@ public abstract class CacheGetEntryAbstractTest extends GridCacheAbstractSelfTes
/**
* @return Transaction concurrency.
*/
- abstract protected TransactionConcurrency concurrency();
+ protected abstract TransactionConcurrency concurrency();
/**
*
* @return Transaction isolation.
*/
- abstract protected TransactionIsolation isolation();
+ protected abstract TransactionIsolation isolation();
/** {@inheritDoc} */
@Override protected long getTestTimeout() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
index 89f0ca7..facea69 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
@@ -633,7 +633,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
/**
*
*/
- protected static abstract class ResourceInjectionEntryProcessorBase<K, V>
+ protected abstract static class ResourceInjectionEntryProcessorBase<K, V>
implements EntryProcessor<K, V, Integer>, Serializable {
/** */
protected transient ResourceInfoSet infoSet;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentGetCacheOnClientTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentGetCacheOnClientTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentGetCacheOnClientTest.java
index fb83405..87c74bc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentGetCacheOnClientTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentGetCacheOnClientTest.java
@@ -34,7 +34,7 @@ import static org.apache.ignite.testframework.GridTestUtils.runAsync;
*/
public class GridCacheConcurrentGetCacheOnClientTest extends GridCommonAbstractTest{
/** Ip finder. */
- private final static TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+ private static final TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
/**
* @param gridName Grid name.
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MapCacheStoreStrategy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MapCacheStoreStrategy.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MapCacheStoreStrategy.java
index 3de3d7a..202e9ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MapCacheStoreStrategy.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MapCacheStoreStrategy.java
@@ -33,16 +33,16 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public class MapCacheStoreStrategy implements TestCacheStoreStrategy {
/** Removes counter. */
- private final static AtomicInteger removes = new AtomicInteger();
+ private static final AtomicInteger removes = new AtomicInteger();
/** Writes counter. */
- private final static AtomicInteger writes = new AtomicInteger();
+ private static final AtomicInteger writes = new AtomicInteger();
/** Reads counter. */
- private final static AtomicInteger reads = new AtomicInteger();
+ private static final AtomicInteger reads = new AtomicInteger();
/** Store map. */
- private final static Map<Object, Object> map = new ConcurrentHashMap<>();
+ private static final Map<Object, Object> map = new ConcurrentHashMap<>();
/** {@inheritDoc} */
@Override public int getReads() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
----------------------------------------------------------------------
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 cc2f2c4..00a3181 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
@@ -1325,7 +1325,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
* Key to test puts and gets with
*/
@SuppressWarnings({"ConstantConditions", "unused"})
- private final static class ComplexBinaryFieldsListHashedKey {
+ private static final class ComplexBinaryFieldsListHashedKey {
/** */
private final Integer firstField = 1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
index 4b613c2..66c204d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
@@ -740,7 +740,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
* @param <E1> Type of first closure parameter.
* @param <E2> Type of second closure parameter.
*/
- public static abstract class CI2Exc<E1, E2> implements CI2<E1, E2> {
+ public abstract static class CI2Exc<E1, E2> implements CI2<E1, E2> {
/**
* Closure body.
*
@@ -766,7 +766,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
*
* @param <T> Type of closure parameter.
*/
- public static abstract class CI1Exc<T> implements CI1<T> {
+ public abstract static class CI1Exc<T> implements CI1<T> {
/**
* Closure body.
*
@@ -789,7 +789,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
/**
* Runnable that can throw any exception.
*/
- public static abstract class RunnableX implements Runnable {
+ public abstract static class RunnableX implements Runnable {
/**
* Closure body.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearClientHitTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearClientHitTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearClientHitTest.java
index 1dd62e4..fd378b7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearClientHitTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearClientHitTest.java
@@ -37,10 +37,10 @@ import static org.apache.ignite.cache.CachePeekMode.NEAR;
*/
public class GridCacheNearClientHitTest extends GridCommonAbstractTest {
/** Ip finder. */
- private final static TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+ private static final TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
/** */
- private final static String CACHE_NAME = "test-near-cache";
+ private static final String CACHE_NAME = "test-near-cache";
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(final String igniteInstanceName) throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
index 43db931..d3a0807 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
@@ -104,7 +104,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
*/
public class GridCacheRebalancingOrderingTest extends GridCommonAbstractTest {
/** {@link Random} for test key generation. */
- private final static Random RANDOM = new Random();
+ private static final Random RANDOM = new Random();
/** Test cache name. */
private static final String TEST_CACHE_NAME = "TestCache";
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java
index 6c6b8df..471b378 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractFeatureTest.java
@@ -276,7 +276,7 @@ public abstract class CacheMvccAbstractFeatureTest extends CacheMvccAbstractTest
}
/** */
- final static Comparator<Cache.Entry<Integer, Person>> ENTRY_CMP =
+ static final Comparator<Cache.Entry<Integer, Person>> ENTRY_CMP =
new Comparator<Cache.Entry<Integer, Person>>() {
@Override public int compare(Cache.Entry<Integer, Person> o1, Cache.Entry<Integer, Person> o2) {
return o1.getKey().compareTo(o2.getKey());
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccOperationChecksTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccOperationChecksTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccOperationChecksTest.java
index 5aedf17..89ae11c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccOperationChecksTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccOperationChecksTest.java
@@ -42,7 +42,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
*/
public class CacheMvccOperationChecksTest extends CacheMvccAbstractTest {
/** Empty Class[]. */
- private final static Class[] E = new Class[]{};
+ private static final Class[] E = new Class[]{};
/** {@inheritDoc} */
@Override protected CacheMode cacheMode() {
@@ -193,7 +193,7 @@ public class CacheMvccOperationChecksTest extends CacheMvccAbstractTest {
/**
*
*/
- private final static IgniteBiPredicate<Object, Object> P = new IgniteBiPredicate<Object, Object>() {
+ private static final IgniteBiPredicate<Object, Object> P = new IgniteBiPredicate<Object, Object>() {
@Override public boolean apply(Object o, Object o2) {
return false;
}