Repository: ignite Updated Branches: refs/heads/master 8130e89f6 -> d829b67e9
http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalDeletionArchiveAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalDeletionArchiveAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalDeletionArchiveAbstractTest.java index f8aeb6a..300b752 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalDeletionArchiveAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalDeletionArchiveAbstractTest.java @@ -90,7 +90,7 @@ public abstract class WalDeletionArchiveAbstractTest extends GridCommonAbstractT /** * @return WAL mode used in test. */ - abstract protected WALMode walMode(); + protected abstract WALMode walMode(); /** * History size parameters consistency check. Should be set just one of wal history size or max wal archive size. http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java index 150d94d..a8b895f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java @@ -48,7 +48,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC */ public class CacheContinuousQueryLostPartitionTest extends GridCommonAbstractTest { /** */ - static public TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + public static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** Cache name. */ public static final String CACHE_NAME = "test_cache"; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java index f2889df..6f5de39 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java @@ -330,7 +330,7 @@ public class CacheContinuousQueryOperationP2PTest extends GridCommonAbstractTest /** * */ - private static abstract class TestLocalListener implements CacheEntryUpdatedListener<Integer, Integer>, + private abstract static class TestLocalListener implements CacheEntryUpdatedListener<Integer, Integer>, CacheEntryCreatedListener<Integer, Integer> { /** {@inheritDoc} */ @Override public void onCreated(Iterable<CacheEntryEvent<? extends Integer, ? extends Integer>> evts) http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java index 0eb2e87..d567dd9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java @@ -332,7 +332,7 @@ public class GridCacheContinuousQueryMultiNodesFilteringTest extends GridCommonA } /** */ - private final static class ListenerConfiguration extends MutableCacheEntryListenerConfiguration { + private static final class ListenerConfiguration extends MutableCacheEntryListenerConfiguration { /** Operation. */ enum Op { /** Insert. */ @@ -384,7 +384,7 @@ public class GridCacheContinuousQueryMultiNodesFilteringTest extends GridCommonA } /** */ - private final static class EntryEventFilterFactory implements Factory<CacheEntryEventFilter> { + private static final class EntryEventFilterFactory implements Factory<CacheEntryEventFilter> { /** */ @IgniteInstanceResource private Ignite ignite; @@ -413,7 +413,7 @@ public class GridCacheContinuousQueryMultiNodesFilteringTest extends GridCommonA } /** */ - private final static class NodeFilter implements IgnitePredicate<ClusterNode> { + private static final class NodeFilter implements IgnitePredicate<ClusterNode> { /** */ private final int idx; @@ -429,7 +429,7 @@ public class GridCacheContinuousQueryMultiNodesFilteringTest extends GridCommonA } /** */ - private final static class NodeFilterByRegexp implements IgnitePredicate<ClusterNode> { + private static final class NodeFilterByRegexp implements IgnitePredicate<ClusterNode> { /** */ private final Pattern pattern; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java index f8f5393..e603744 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java @@ -42,7 +42,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; */ public class IgniteCacheContinuousQueryReconnectTest extends GridCommonAbstractTest implements Serializable { /** */ - final private static AtomicInteger cnt = new AtomicInteger(); + private static final AtomicInteger cnt = new AtomicInteger(); /** */ private volatile boolean isClient = false; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbMemoryLeakLargeObjectsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbMemoryLeakLargeObjectsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbMemoryLeakLargeObjectsTest.java index 077a1e1..ff3e1bd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbMemoryLeakLargeObjectsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbMemoryLeakLargeObjectsTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.internal.IgniteEx; */ public class IgniteDbMemoryLeakLargeObjectsTest extends IgniteDbMemoryLeakAbstractTest { /** */ - private final static int[] ARRAY; + private static final int[] ARRAY; static { ARRAY = new int[1024]; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java index 1e24610..c476a76 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java @@ -171,7 +171,7 @@ public class IgfsSecondaryFileSystemInjectionSelfTest extends GridCommonAbstract /** * */ - private static abstract class TestBaseSecondaryFsMock implements IgfsSecondaryFileSystem { + private abstract static class TestBaseSecondaryFsMock implements IgfsSecondaryFileSystem { /** {@inheritDoc} */ @Override public boolean exists(IgfsPath path) { http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java index 93d063d..f09b744 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyNodeStopSelfTest.java @@ -34,7 +34,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; */ public class GridServiceProxyNodeStopSelfTest extends GridCommonAbstractTest { /** */ - private final static TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** {@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/spi/communication/tcp/GridTcpCommunicationSpiTcpFailureDetectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpFailureDetectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpFailureDetectionSelfTest.java index 88b25cd..1760171 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpFailureDetectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpFailureDetectionSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.spi.communication.CommunicationSpi; */ public class GridTcpCommunicationSpiTcpFailureDetectionSelfTest extends GridTcpCommunicationSpiTcpSelfTest { /** */ - private final static int SPI_COUNT = 4; + private static final int SPI_COUNT = 4; private TcpCommunicationSpi spis[] = new TcpCommunicationSpi[SPI_COUNT]; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationStatisticsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationStatisticsTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationStatisticsTest.java index 377d1eb..b2c6cbb 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationStatisticsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationStatisticsTest.java @@ -55,10 +55,10 @@ public class TcpCommunicationStatisticsTest extends GridCommonAbstractTest { private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Mutex. */ - final private Object mux = new Object(); + private final Object mux = new Object(); /** */ - final private CountDownLatch latch = new CountDownLatch(1); + private final CountDownLatch latch = new CountDownLatch(1); static { GridIoMessageFactory.registerCustom(GridTestMessage.DIRECT_TYPE, new CO<Message>() { http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java index c167a90..e878b98 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java @@ -51,10 +51,10 @@ import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; */ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscoverySpiSelfTest { /** */ - private final static int FAILURE_AWAIT_TIME = 7_000; + private static final int FAILURE_AWAIT_TIME = 7_000; /** */ - private final static long FAILURE_THRESHOLD = 10_000; + private static final long FAILURE_THRESHOLD = 10_000; /** Failure detection timeout for nodes configuration. */ private static long failureThreshold = FAILURE_THRESHOLD; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryWithWrongServerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryWithWrongServerTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryWithWrongServerTest.java index ffd0d03..685c993 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryWithWrongServerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryWithWrongServerTest.java @@ -42,10 +42,10 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; */ public class TcpDiscoveryWithWrongServerTest extends GridCommonAbstractTest { /** Non-Ignite Server port #1. */ - private final static int SERVER_PORT = 47500; + private static final int SERVER_PORT = 47500; /** Non-Ignite Server port #2. */ - private final static int LAST_SERVER_PORT = SERVER_PORT + 5; + private static final int LAST_SERVER_PORT = SERVER_PORT + 5; /** Non-Ignite Server sockets. */ private List<ServerSocket> srvSocks = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java index 90ef8d7..b82484fb 100644 --- a/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java @@ -62,7 +62,7 @@ public class SocketStreamerSelfTest extends GridCommonAbstractTest { private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Grid count. */ - private final static int GRID_CNT = 3; + private static final int GRID_CNT = 3; /** Count. */ private static final int CNT = 500; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java index f81d103..681d904 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java @@ -1736,7 +1736,7 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { /** * */ - private static abstract class CacheTaskAdapter<K, V, R> implements IgniteCallable<R> { + private abstract static class CacheTaskAdapter<K, V, R> implements IgniteCallable<R> { /** Ignite. */ @IgniteInstanceResource protected Ignite ignite; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java ---------------------------------------------------------------------- diff --git a/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java b/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java index 64559ef..54482e5 100644 --- a/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java +++ b/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java @@ -88,7 +88,7 @@ public class IgniteSink extends AbstractSink implements Configurable { * Starts a grid and initializes an event transformer. */ @SuppressWarnings("unchecked") - @Override synchronized public void start() { + @Override public synchronized void start() { A.notNull(springCfgPath, "Ignite config file"); A.notNull(cacheName, "Cache name"); A.notNull(eventTransformerCls, "Event transformer class"); @@ -122,7 +122,7 @@ public class IgniteSink extends AbstractSink implements Configurable { /** * Stops the grid. */ - @Override synchronized public void stop() { + @Override public synchronized void stop() { if (ignite != null) ignite.close(); http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java ---------------------------------------------------------------------- diff --git a/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java b/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java index 031eb5d..73e61e7 100644 --- a/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java +++ b/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java @@ -79,7 +79,7 @@ public class IgniteSinkTest extends GridCommonAbstractTest { IgniteSink sink = new IgniteSink() { // Setting the listener on cache before sink processing starts. - @Override synchronized public void start() { + @Override public synchronized void start() { super.start(); grid.events(grid.cluster().forCacheNodes(CACHE_NAME)).localListen(putLsnr, EVT_CACHE_OBJECT_PUT); http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/gce/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/gce/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinder.java b/modules/gce/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinder.java index c238998..f5ed580 100644 --- a/modules/gce/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinder.java +++ b/modules/gce/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinder.java @@ -75,7 +75,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter; */ public class TcpDiscoveryGoogleStorageIpFinder extends TcpDiscoveryIpFinderAdapter { /** Default object's content. */ - private final static ByteArrayInputStream OBJECT_CONTENT = new ByteArrayInputStream(new byte[0]); + private static final ByteArrayInputStream OBJECT_CONTENT = new ByteArrayInputStream(new byte[0]); /** Grid logger. */ @LoggerResource http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java index e09e102..3268d83 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java @@ -505,7 +505,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx { /** {@inheritDoc} */ @Override public HadoopIgfsStreamDelegate create(final IgfsPath path, final boolean overwrite, - final boolean colocate, final int replication, final long blockSize, final @Nullable Map<String, String> props) + final boolean colocate, final int replication, final long blockSize, @Nullable final Map<String, String> props) throws IgniteCheckedException { try { return IgfsUserContext.doAs(user, new IgniteOutClosure<HadoopIgfsStreamDelegate>() { @@ -527,7 +527,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx { /** {@inheritDoc} */ @Override public HadoopIgfsStreamDelegate append(final IgfsPath path, final boolean create, - final @Nullable Map<String, String> props) throws IgniteCheckedException { + @Nullable final Map<String, String> props) throws IgniteCheckedException { try { return IgfsUserContext.doAs(user, new IgniteOutClosure<HadoopIgfsStreamDelegate>() { @Override public HadoopIgfsStreamDelegate apply() { http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java index 32c06fa..01dd68f 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java @@ -392,7 +392,7 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx, HadoopIgfsIpcIoListener /** {@inheritDoc} */ @Override public IgniteInternalFuture<byte[]> readData(HadoopIgfsStreamDelegate desc, long pos, int len, - final @Nullable byte[] outBuf, final int outOff, final int outLen) { + @Nullable final byte[] outBuf, final int outOff, final int outLen) { assert len > 0; final IgfsStreamControlRequest msg = new IgfsStreamControlRequest(); http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/PreparedStatementExImpl.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/PreparedStatementExImpl.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/PreparedStatementExImpl.java index 922c1ab..e98e537 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/PreparedStatementExImpl.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/PreparedStatementExImpl.java @@ -283,8 +283,8 @@ final class PreparedStatementExImpl implements PreparedStatementEx { delegate.setSQLXML(parameterIndex, xmlObject); } - @Override - public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException { + /** {@inheritDoc} */ + @Override public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException { delegate.setObject(parameterIndex, x, targetSqlType, scaleOrLength); } @@ -620,7 +620,7 @@ final class PreparedStatementExImpl implements PreparedStatementEx { } /** {@inheritDoc} */ - @Override public @Nullable <T> T meta(int id) { + @Override @Nullable public <T> T meta(int id) { return meta != null && id < meta.length ? (T)meta[id] : null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/UpdateResult.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/UpdateResult.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/UpdateResult.java index 32381ba..5afbc16 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/UpdateResult.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/UpdateResult.java @@ -42,7 +42,8 @@ public final class UpdateResult { * @param cnt Updated rows count. * @param errKeys Array of erroneous keys. */ - public @SuppressWarnings("ConstantConditions") UpdateResult(long cnt, Object[] errKeys) { + @SuppressWarnings("ConstantConditions") + public UpdateResult(long cnt, Object[] errKeys) { this.cnt = cnt; this.errKeys = U.firstNotNull(errKeys, X.EMPTY_OBJECT_ARRAY); } http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlArguments.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlArguments.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlArguments.java index f5aa332..c2405e3 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlArguments.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlArguments.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; */ public class DmlArguments { /** Operand that always evaluates as {@code null}. */ - private final static DmlArgument NULL_ARG = new ConstantArgument(null); + private static final DmlArgument NULL_ARG = new ConstantArgument(null); /** * Create argument from AST element. http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlanBuilder.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlanBuilder.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlanBuilder.java index 5e44f27..cf7903e 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlanBuilder.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlanBuilder.java @@ -829,7 +829,7 @@ public final class UpdatePlanBuilder { /** * Simple supplier that just takes specified element of a given row. */ - private final static class PlainValueSupplier implements KeyValueSupplier { + private static final class PlainValueSupplier implements KeyValueSupplier { /** Index of column to use. */ private final int colIdx; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlKeyword.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlKeyword.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlKeyword.java index 48fc8a9..6c05928 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlKeyword.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlKeyword.java @@ -28,7 +28,7 @@ public final class GridSqlKeyword extends GridSqlElement { * @see ValueExpression#getDefault() * @see Parser#parseUpdate() */ - public final static GridSqlKeyword DEFAULT = new GridSqlKeyword("DEFAULT"); + public static final GridSqlKeyword DEFAULT = new GridSqlKeyword("DEFAULT"); /** Keyword to return as SQL. */ private final String keyword; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java index c811cb5..c432743 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java @@ -322,7 +322,7 @@ public abstract class IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm /** * */ - protected final static class Key implements Serializable { + protected static final class Key implements Serializable { /** */ private static final long serialVersionUID = 0L; @@ -356,7 +356,7 @@ public abstract class IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm /** * */ - protected final static class Key2 implements Serializable { + protected static final class Key2 implements Serializable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/SqlFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/SqlFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/SqlFieldsQuerySelfTest.java index f684841..5cd5998 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/SqlFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/SqlFieldsQuerySelfTest.java @@ -34,7 +34,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; */ public class SqlFieldsQuerySelfTest extends GridCommonAbstractTest { /** INSERT statement. */ - private final static String INSERT = "insert into Person(_key, name) values (5, 'x')"; + private static final String INSERT = "insert into Person(_key, name) values (5, 'x')"; /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java index 5ddafa3..dd2d901 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java @@ -52,14 +52,14 @@ import static org.apache.ignite.internal.processors.cache.index.AbstractSchemaSe */ public abstract class DynamicColumnsAbstractTest extends GridCommonAbstractTest { /** SQL to create test table. */ - final static String CREATE_SQL = "CREATE TABLE IF NOT EXISTS Person (id int primary key, name varchar)"; + static final String CREATE_SQL = "CREATE TABLE IF NOT EXISTS Person (id int primary key, name varchar)"; /** SQL to create test table with additional columns to drop. */ - final static String CREATE_SQL_4_COLS = "CREATE TABLE IF NOT EXISTS Person (id int primary key, " + + static final String CREATE_SQL_4_COLS = "CREATE TABLE IF NOT EXISTS Person (id int primary key, " + "name varchar, age int, city varchar)"; /** SQL to drop test table. */ - final static String DROP_SQL = "DROP TABLE Person"; + static final String DROP_SQL = "DROP TABLE Person"; /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java index e74e9cd..bd2f8d0 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java @@ -43,17 +43,17 @@ public abstract class H2DynamicColumnsAbstractBasicSelfTest extends DynamicColum /** * Index of coordinator node. */ - final static int SRV_CRD_IDX = 0; + static final int SRV_CRD_IDX = 0; /** * Index of non coordinator server node. */ - final static int SRV_IDX = 1; + static final int SRV_IDX = 1; /** * Index of client. */ - final static int CLI_IDX = 2; + static final int CLI_IDX = 2; /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { @@ -787,7 +787,7 @@ public abstract class H2DynamicColumnsAbstractBasicSelfTest extends DynamicColum } /** City class. */ - private final static class City { + private static final class City { /** City id. */ @QuerySqlField private int id; @@ -844,7 +844,7 @@ public abstract class H2DynamicColumnsAbstractBasicSelfTest extends DynamicColum } /** */ - private final static class GuidTest { + private static final class GuidTest { /** */ @QuerySqlField private int id; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java index 10ef56f..2d7a636 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java @@ -40,7 +40,7 @@ import org.apache.ignite.internal.util.typedef.F; */ public abstract class H2DynamicIndexAbstractSelfTest extends AbstractSchemaSelfTest { /** Client node index. */ - private final static int CLIENT = 2; + private static final int CLIENT = 2; /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexingComplexAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexingComplexAbstractTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexingComplexAbstractTest.java index 2c21e23..e53a78d 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexingComplexAbstractTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexingComplexAbstractTest.java @@ -49,16 +49,16 @@ public abstract class H2DynamicIndexingComplexAbstractTest extends DynamicIndexA private final int backups; /** Names of companies to use. */ - private final static List<String> COMPANIES = Arrays.asList("ASF", "GNU", "BSD"); + private static final List<String> COMPANIES = Arrays.asList("ASF", "GNU", "BSD"); /** Cities to use. */ - private final static List<String> CITIES = Arrays.asList("St. Petersburg", "Boston", "Berkeley", "London"); + private static final List<String> CITIES = Arrays.asList("St. Petersburg", "Boston", "Berkeley", "London"); /** Index of server node. */ - protected final static int SRV_IDX = 0; + protected static final int SRV_IDX = 0; /** Index of client node. */ - protected final static int CLIENT_IDX = 1; + protected static final int CLIENT_IDX = 1; /** * Constructor. http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java index dcd46ff..8269426 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java @@ -264,7 +264,7 @@ public class SqlTransactionsCommandsWithMvccEnabledSelfTest extends AbstractSche } /** */ - private final static EntryProcessor<Integer, Integer, Object> ENTRY_PROC = + private static final EntryProcessor<Integer, Integer, Object> ENTRY_PROC = new EntryProcessor<Integer, Integer, Object>() { @Override public Object process(MutableEntry<Integer, Integer> entry, Object... arguments) throws EntryProcessorException { @@ -273,7 +273,7 @@ public class SqlTransactionsCommandsWithMvccEnabledSelfTest extends AbstractSche }; /** */ - private final static CacheEntryProcessor<Integer, Integer, Object> CACHE_ENTRY_PROC = + private static final CacheEntryProcessor<Integer, Integer, Object> CACHE_ENTRY_PROC = new CacheEntryProcessor<Integer, Integer, Object>() { @Override public Object process(MutableEntry<Integer, Integer> entry, Object... arguments) throws EntryProcessorException { http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java index d93bdab..fbc07c3 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java @@ -361,7 +361,7 @@ public class SqlTransactionsSelfTest extends AbstractSchemaSelfTest { } /** */ - private final static EntryProcessor<Integer, Integer, Object> ENTRY_PROC = + private static final EntryProcessor<Integer, Integer, Object> ENTRY_PROC = new EntryProcessor<Integer, Integer, Object>() { @Override public Object process(MutableEntry<Integer, Integer> entry, Object... arguments) throws EntryProcessorException { @@ -370,7 +370,7 @@ public class SqlTransactionsSelfTest extends AbstractSchemaSelfTest { }; /** */ - private final static CacheEntryProcessor<Integer, Integer, Object> CACHE_ENTRY_PROC = + private static final CacheEntryProcessor<Integer, Integer, Object> CACHE_ENTRY_PROC = new CacheEntryProcessor<Integer, Integer, Object>() { @Override public Object process(MutableEntry<Integer, Integer> entry, Object... arguments) throws EntryProcessorException { http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteCachelessQueriesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteCachelessQueriesSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteCachelessQueriesSelfTest.java index a7dae9e..b8fc61b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteCachelessQueriesSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteCachelessQueriesSelfTest.java @@ -44,7 +44,7 @@ public class IgniteCachelessQueriesSelfTest extends GridCommonAbstractTest { private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** */ - private final static String SELECT = + private static final String SELECT = "select count(*) from \"pers\".Person p, \"org\".Organization o where p.orgId = o._key"; /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/indexing/src/test/java/org/apache/ignite/sqltests/BaseSqlTest.java ---------------------------------------------------------------------- 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 5827db1..9431cfa 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 @@ -64,25 +64,25 @@ import org.jetbrains.annotations.Nullable; */ public class BaseSqlTest extends GridCommonAbstractTest { /** Number of all employees. */ - public final static long EMP_CNT = 1000L; + public static final long EMP_CNT = 1000L; /** Number of all departments. */ - public final static long DEP_CNT = 50L; + public static final long DEP_CNT = 50L; /** Number of all addresses. */ - public final static long ADDR_CNT = 500L; + public static final long ADDR_CNT = 500L; /** Number of employees that aren't associated with any department. */ - public final static long FREE_EMP_CNT = 50; + public static final long FREE_EMP_CNT = 50; /** Number of departments that don't have employees and addresses. */ - public final static long FREE_DEP_CNT = 5; + public static final long FREE_DEP_CNT = 5; /** Number of adderesses that are not associated with any departments. */ - public final static long FREE_ADDR_CNT = 30; + public static final long FREE_ADDR_CNT = 30; /** Number of possible age values (width of ages values range). */ - public final static int AGES_CNT = 50; + public static final int AGES_CNT = 50; /** Name of client node. */ public static final String CLIENT_NODE_NAME = "clientNode"; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/kafka/src/main/java/org/apache/ignite/stream/kafka/KafkaStreamer.java ---------------------------------------------------------------------- diff --git a/modules/kafka/src/main/java/org/apache/ignite/stream/kafka/KafkaStreamer.java b/modules/kafka/src/main/java/org/apache/ignite/stream/kafka/KafkaStreamer.java index bdbd916..39d2e50 100644 --- a/modules/kafka/src/main/java/org/apache/ignite/stream/kafka/KafkaStreamer.java +++ b/modules/kafka/src/main/java/org/apache/ignite/stream/kafka/KafkaStreamer.java @@ -44,7 +44,7 @@ import org.apache.kafka.common.errors.WakeupException; */ public class KafkaStreamer<K, V> extends StreamAdapter<ConsumerRecord, K, V> { /** Default polling timeout. */ - private final static long DFLT_TIMEOUT = 100; + private static final long DFLT_TIMEOUT = 100; /** Logger. */ private IgniteLogger log; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java ---------------------------------------------------------------------- diff --git a/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java b/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java index 5bd2010..892a592 100644 --- a/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java +++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java @@ -52,7 +52,7 @@ public class IgniteProvider { private static final String DOWNLOAD_URL_PATTERN = "https://archive.apache.org/dist/ignite/%s/apache-ignite-%s-bin.zip";; /** URL for request Ignite latest version. */ - private final static String IGNITE_LATEST_VERSION_URL = "https://ignite.apache.org/latest";; + private static final String IGNITE_LATEST_VERSION_URL = "https://ignite.apache.org/latest";; /** Mirrors. */ private static final String APACHE_MIRROR_URL = "https://www.apache.org/dyn/closer.cgi?as_json=1";; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/ml/src/main/java/org/apache/ignite/ml/Model.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/Model.java b/modules/ml/src/main/java/org/apache/ignite/ml/Model.java index a042666..8428b0a 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/Model.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/Model.java @@ -36,7 +36,7 @@ public interface Model<T, V> extends IgniteFunction<T, V> { /** * @param pretty Use pretty mode. */ - default public String toString(boolean pretty) { + public default String toString(boolean pretty) { return getClass().getSimpleName(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/ml/src/main/java/org/apache/ignite/ml/dataset/Dataset.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/Dataset.java b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/Dataset.java index 24a2063..230a467 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/Dataset.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/Dataset.java @@ -85,7 +85,7 @@ public interface Dataset<C extends Serializable, D extends AutoCloseable> extend * @param <R> Type of a result. * @return Final result. */ - default public <R> R computeWithCtx(IgniteTriFunction<C, D, Integer, R> map, IgniteBinaryOperator<R> reduce) { + public default <R> R computeWithCtx(IgniteTriFunction<C, D, Integer, R> map, IgniteBinaryOperator<R> reduce) { return computeWithCtx(map, reduce, null); } @@ -98,7 +98,7 @@ public interface Dataset<C extends Serializable, D extends AutoCloseable> extend * @param <R> Type of a result. * @return Final result. */ - default public <R> R compute(IgniteBiFunction<D, Integer, R> map, IgniteBinaryOperator<R> reduce) { + public default <R> R compute(IgniteBiFunction<D, Integer, R> map, IgniteBinaryOperator<R> reduce) { return compute(map, reduce, null); } @@ -112,7 +112,7 @@ public interface Dataset<C extends Serializable, D extends AutoCloseable> extend * @param <R> Type of a result. * @return Final result. */ - default public <R> R computeWithCtx(IgniteBiFunction<C, D, R> map, IgniteBinaryOperator<R> reduce, R identity) { + public default <R> R computeWithCtx(IgniteBiFunction<C, D, R> map, IgniteBinaryOperator<R> reduce, R identity) { return computeWithCtx((ctx, data, partIdx) -> map.apply(ctx, data), reduce, identity); } @@ -126,7 +126,7 @@ public interface Dataset<C extends Serializable, D extends AutoCloseable> extend * @param <R> Type of a result. * @return Final result. */ - default public <R> R compute(IgniteFunction<D, R> map, IgniteBinaryOperator<R> reduce, R identity) { + public default <R> R compute(IgniteFunction<D, R> map, IgniteBinaryOperator<R> reduce, R identity) { return compute((data, partIdx) -> map.apply(data), reduce, identity); } @@ -139,7 +139,7 @@ public interface Dataset<C extends Serializable, D extends AutoCloseable> extend * @param <R> Type of a result. * @return Final result. */ - default public <R> R computeWithCtx(IgniteBiFunction<C, D, R> map, IgniteBinaryOperator<R> reduce) { + public default <R> R computeWithCtx(IgniteBiFunction<C, D, R> map, IgniteBinaryOperator<R> reduce) { return computeWithCtx((ctx, data, partIdx) -> map.apply(ctx, data), reduce); } @@ -152,7 +152,7 @@ public interface Dataset<C extends Serializable, D extends AutoCloseable> extend * @param <R> Type of a result. * @return Final result. */ - default public <R> R compute(IgniteFunction<D, R> map, IgniteBinaryOperator<R> reduce) { + public default <R> R compute(IgniteFunction<D, R> map, IgniteBinaryOperator<R> reduce) { return compute((data, partIdx) -> map.apply(data), reduce); } @@ -162,7 +162,7 @@ public interface Dataset<C extends Serializable, D extends AutoCloseable> extend * * @param map Function applied to every partition {@code data}, {@code context} and partition index. */ - default public void computeWithCtx(IgniteTriConsumer<C, D, Integer> map) { + public default void computeWithCtx(IgniteTriConsumer<C, D, Integer> map) { computeWithCtx((ctx, data, partIdx) -> { map.accept(ctx, data, partIdx); return null; @@ -174,7 +174,7 @@ public interface Dataset<C extends Serializable, D extends AutoCloseable> extend * * @param map Function applied to every partition {@code data} and partition index. */ - default public void compute(IgniteBiConsumer<D, Integer> map) { + public default void compute(IgniteBiConsumer<D, Integer> map) { compute((data, partIdx) -> { map.accept(data, partIdx); return null; @@ -186,7 +186,7 @@ public interface Dataset<C extends Serializable, D extends AutoCloseable> extend * * @param map Function applied to every partition {@code data} and {@code context}. */ - default public void computeWithCtx(IgniteBiConsumer<C, D> map) { + public default void computeWithCtx(IgniteBiConsumer<C, D> map) { computeWithCtx((ctx, data, partIdx) -> map.accept(ctx, data)); } @@ -195,7 +195,7 @@ public interface Dataset<C extends Serializable, D extends AutoCloseable> extend * * @param map Function applied to every partition {@code data}. */ - default public void compute(IgniteConsumer<D> map) { + public default void compute(IgniteConsumer<D> map) { compute((data, partIdx) -> map.accept(data)); } @@ -207,7 +207,7 @@ public interface Dataset<C extends Serializable, D extends AutoCloseable> extend * @param <I> Type of a new wrapped dataset. * @return New wrapped dataset. */ - default public <I extends Dataset<C ,D>> I wrap(IgniteFunction<Dataset<C, D>, I> wrapper) { + public default <I extends Dataset<C ,D>> I wrap(IgniteFunction<Dataset<C, D>, I> wrapper) { return wrapper.apply(this); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/ml/src/main/java/org/apache/ignite/ml/dataset/PartitionContextBuilder.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/PartitionContextBuilder.java b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/PartitionContextBuilder.java index 21c9907..027ec34 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/PartitionContextBuilder.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/PartitionContextBuilder.java @@ -52,7 +52,7 @@ public interface PartitionContextBuilder<K, V, C extends Serializable> extends S * @param <C2> New type of a partition {@code context}. * @return Composed partition {@code context} builder. */ - default public <C2 extends Serializable> PartitionContextBuilder<K, V, C2> andThen(IgniteFunction<C, C2> fun) { + public default <C2 extends Serializable> PartitionContextBuilder<K, V, C2> andThen(IgniteFunction<C, C2> fun) { return (upstreamData, upstreamDataSize) -> fun.apply(build(upstreamData, upstreamDataSize)); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/ml/src/main/java/org/apache/ignite/ml/dataset/PartitionDataBuilder.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/PartitionDataBuilder.java b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/PartitionDataBuilder.java index 361719f..c1391b1 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/dataset/PartitionDataBuilder.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/dataset/PartitionDataBuilder.java @@ -56,7 +56,7 @@ public interface PartitionDataBuilder<K, V, C extends Serializable, D extends Au * @param <D2> New type of a partition {@code data}. * @return Composed partition {@code data} builder. */ - default public <D2 extends AutoCloseable> PartitionDataBuilder<K, V, C, D2> andThen( + public default <D2 extends AutoCloseable> PartitionDataBuilder<K, V, C, D2> andThen( IgniteBiFunction<D, C, D2> fun) { return (upstreamData, upstreamDataSize, ctx) -> fun.apply(build(upstreamData, upstreamDataSize, ctx), ctx); } http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/NoOpLogger.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/NoOpLogger.java b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/NoOpLogger.java index 67b48f5..729604f 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/NoOpLogger.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/environment/logging/NoOpLogger.java @@ -54,7 +54,7 @@ public class NoOpLogger implements MLLogger { */ private static class Factory implements MLLogger.Factory { /** NoOpLogger instance. */ - private final static NoOpLogger NO_OP_LOGGER = new NoOpLogger(); + private static final NoOpLogger NO_OP_LOGGER = new NoOpLogger(); /** {@inheritDoc} */ @Override public <T> MLLogger create(Class<T> targetCls) { http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/ml/src/main/java/org/apache/ignite/ml/math/Blas.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/Blas.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/Blas.java index a22ec06..77a0d10 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/math/Blas.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/Blas.java @@ -37,12 +37,12 @@ import org.apache.ignite.ml.math.util.MatrixUtil; */ public class Blas { /** F2J implementation of BLAS. */ - transient static private BLAS f2jBlas = new F2jBLAS(); + private static transient BLAS f2jBlas = new F2jBLAS(); /** * Native implementation of BLAS. F2J implementation will be used as fallback if no native implementation is found. */ - transient static private BLAS nativeBlas = BLAS.getInstance(); + private static transient BLAS nativeBlas = BLAS.getInstance(); /** * Performs y += a * x http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/ml/src/main/java/org/apache/ignite/ml/math/Tracer.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/Tracer.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/Tracer.java index d01b150..c4703f4 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/math/Tracer.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/Tracer.java @@ -53,7 +53,7 @@ public class Tracer { /** * Continuous red-to-blue color mapping. */ - static private ColorMapper defaultColorMapper(double min, double max) { + private static ColorMapper defaultColorMapper(double min, double max) { double range = max - min; return new ColorMapper() { @@ -76,7 +76,7 @@ public class Tracer { * @param vec Vector to map. * @return {@link ColorMapper} for the given vector. */ - static private ColorMapper mkVectorColorMapper(Vector vec) { + private static ColorMapper mkVectorColorMapper(Vector vec) { return defaultColorMapper(vec.minValue(), vec.maxValue()); } @@ -87,7 +87,7 @@ public class Tracer { * @param mtx Matrix to be mapped. * @return Color mapper for given matrix. */ - static private ColorMapper mkMatrixColorMapper(Matrix mtx) { + private static ColorMapper mkMatrixColorMapper(Matrix mtx) { return defaultColorMapper(mtx.minValue(), mtx.maxValue()); } @@ -148,7 +148,7 @@ public class Tracer { * @param fmt Format string for matrix elements in the row. * @return String representation of given matrix row according to given format. */ - static private String rowStr(Matrix mtx, int row, String fmt) { + private static String rowStr(Matrix mtx, int row, String fmt) { StringBuilder buf = new StringBuilder(); boolean first = true; @@ -333,7 +333,7 @@ public class Tracer { * @param clr {@link Color} to paint. * @return JSON representation for given value and color. */ - static private String dataColorJson(double d, Color clr) { + private static String dataColorJson(double d, Color clr) { return "{" + "d: " + String.format(LOCALE, "%4f", d) + ", r: " + clr.getRed() + @@ -414,7 +414,7 @@ public class Tracer { * @param html HTML content. * @throws IOException Thrown in case of any errors. */ - static private void openHtmlFile(String html) throws IOException { + private static void openHtmlFile(String html) throws IOException { File temp = File.createTempFile(IgniteUuid.randomUuid().toString(), ".html"); BufferedWriter bw = new BufferedWriter(new FileWriter(temp)); http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/MatrixStorage.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/MatrixStorage.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/MatrixStorage.java index 00d1ce0..dfc3a29 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/MatrixStorage.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/primitives/matrix/MatrixStorage.java @@ -69,7 +69,7 @@ public interface MatrixStorage extends Externalizable, StorageOpsMetrics, Destro * * @see StorageOpsMetrics#isArrayBased() */ - default public double[] data() { + public default double[] data() { return null; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/RPropUpdateCalculator.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/RPropUpdateCalculator.java b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/RPropUpdateCalculator.java index 17c4815..db6da1d 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/RPropUpdateCalculator.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/optimization/updatecalculators/RPropUpdateCalculator.java @@ -67,12 +67,12 @@ public class RPropUpdateCalculator implements ParameterUpdateCalculator<SmoothPa /** * Maximal value for update. */ - private final static double UPDATE_MAX = 50.0; + private static final double UPDATE_MAX = 50.0; /** * Minimal value for update. */ - private final static double UPDATE_MIN = 1E-6; + private static final double UPDATE_MIN = 1E-6; /** * Loss function. http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/ml/src/main/java/org/apache/ignite/ml/tree/impurity/ImpurityMeasure.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/tree/impurity/ImpurityMeasure.java b/modules/ml/src/main/java/org/apache/ignite/ml/tree/impurity/ImpurityMeasure.java index 7ad2b80..85f59e6 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/tree/impurity/ImpurityMeasure.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/tree/impurity/ImpurityMeasure.java @@ -49,7 +49,7 @@ public interface ImpurityMeasure<T extends ImpurityMeasure<T>> extends Comparabl public T subtract(T measure); /** {@inheritDoc} */ - default public int compareTo(T o) { + public default int compareTo(T o) { return Double.compare(impurity(), o.impurity()); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/ml/src/main/java/org/apache/ignite/ml/tree/impurity/util/StepFunctionCompressor.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/tree/impurity/util/StepFunctionCompressor.java b/modules/ml/src/main/java/org/apache/ignite/ml/tree/impurity/util/StepFunctionCompressor.java index 41baa29..fe3ecdb 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/tree/impurity/util/StepFunctionCompressor.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/tree/impurity/util/StepFunctionCompressor.java @@ -41,7 +41,7 @@ public interface StepFunctionCompressor<T extends ImpurityMeasure<T>> extends Se * @param functions Array of step functions. * @return Arrays of compressed step function. */ - default public StepFunction<T>[] compress(StepFunction<T>[] functions) { + public default StepFunction<T>[] compress(StepFunction<T>[] functions) { if (functions == null) return null; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsFixtures.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsFixtures.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsFixtures.java index d87478b..e64fea7 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsFixtures.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/primitives/vector/VectorImplementationsFixtures.java @@ -129,7 +129,7 @@ class VectorImplementationsFixtures { } /** */ - private static abstract class VectorSizesFixture implements Iterable<Vector> { + private abstract static class VectorSizesFixture implements Iterable<Vector> { /** */ private final Supplier<VectorSizesIterator> iter; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSession.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSession.java b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSession.java index 2e43f2f..2010f91 100644 --- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSession.java +++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSession.java @@ -46,7 +46,7 @@ class WebSession implements HttpSession, Externalizable { private static final long serialVersionUID = 0L; /** Flag indicating if the session is valid. */ - private volatile transient boolean isValid = true; + private transient volatile boolean isValid = true; /** Empty session context. */ private static final HttpSessionContext EMPTY_SES_CTX = new HttpSessionContext() { http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java index 1008b58..b16b536 100644 --- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java +++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java @@ -98,7 +98,7 @@ class WebSessionV2 implements HttpSession { * @param entity Entity. * @param marsh Marshaller. */ - WebSessionV2(final String id, final @Nullable HttpSession ses, final boolean isNew, final ServletContext ctx, + WebSessionV2(final String id, @Nullable final HttpSession ses, final boolean isNew, final ServletContext ctx, @Nullable WebSessionEntity entity, final Marshaller marsh) { assert id != null; assert marsh != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/d829b67e/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java index 9f0cc6d..bd2891f 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java @@ -54,7 +54,7 @@ public abstract class ZookeeperDiscoverySpiAbstractTestSuite extends TestSuite { * * @param cfg Configuration to change. */ - public synchronized static void preprocessConfiguration(IgniteConfiguration cfg) { + public static synchronized void preprocessConfiguration(IgniteConfiguration cfg) { if (testingCluster == null) throw new IllegalStateException("Test Zookeeper cluster is not started.");
