Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9B322200C0F for ; Thu, 2 Feb 2017 08:54:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 99D5D160B54; Thu, 2 Feb 2017 07:54:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5A7E9160B65 for ; Thu, 2 Feb 2017 08:54:08 +0100 (CET) Received: (qmail 2265 invoked by uid 500); 2 Feb 2017 07:54:06 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 2089 invoked by uid 99); 2 Feb 2017 07:54:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Feb 2017 07:54:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C3262DFC63; Thu, 2 Feb 2017 07:54:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Thu, 02 Feb 2017 07:54:09 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/16] ignite git commit: IGNITE-4612 Minor code cleanup archived-at: Thu, 02 Feb 2017 07:54:19 -0000 http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java index 7cbd77c..4872314 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java @@ -183,8 +183,7 @@ public final class GridDhtForceKeysFuture extends GridCompoundFuture extends GridCompoundFuture extends GridCompoundFuture, E @Override public String toString() { return S.toString(GridDhtPartitionMap2.class, this, "size", size()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 2cfc0d0..a334fd5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -749,7 +749,7 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter extends CacheDistributedGetFutureAdap catch (IgniteCheckedException e) { // Fail the whole thing. if (e instanceof ClusterTopologyCheckedException) - fut.onNodeLeft((ClusterTopologyCheckedException) e); + fut.onNodeLeft(); else fut.onResult(e); } @@ -903,9 +903,8 @@ public final class GridNearGetFuture extends CacheDistributedGetFutureAdap } /** - * @param e Topology exception. */ - synchronized void onNodeLeft(ClusterTopologyCheckedException e) { + synchronized void onNodeLeft() { if (remapped) return; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java index c464b36..6ff761e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java @@ -125,7 +125,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim break; } - catch (GridCacheEntryRemovedException e) { + catch (GridCacheEntryRemovedException ignored) { entry = ctx.cache().entryEx(entry.key(), tx.topologyVersion()); txEntry.cached(entry); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java index b314b81..a8b6550 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java @@ -143,7 +143,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa if (tx.onePhaseCommit()) { tx.markForBackupCheck(); - onComplete(discoThread); + onComplete(); return; } @@ -163,7 +163,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa } } - onComplete(discoThread); + onComplete(); } } @@ -265,7 +265,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa ERR_UPD.compareAndSet(this, null, err); - return onComplete(false); + return onComplete(); } /** @@ -279,10 +279,9 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa /** * Completeness callback. * - * @param discoThread {@code True} if executed from discovery thread. * @return {@code True} if future was finished by this call. */ - private boolean onComplete(boolean discoThread) { + private boolean onComplete() { Throwable err0 = err; if (err0 == null || tx.needCheckBackup()) @@ -732,7 +731,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa ERR_UPD.compareAndSet(this, null, new IgniteTxTimeoutCheckedException("Failed to acquire lock " + "within provided timeout for transaction [timeout=" + tx.timeout() + ", tx=" + tx + ']')); - onComplete(false); + onComplete(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java index 9acab56..c5ee6fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java @@ -595,7 +595,7 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu ", ver=" + backup.version() + ']')); } } - catch (ClusterTopologyCheckedException e) { + catch (ClusterTopologyCheckedException ignored) { mini.onNodeLeft(backupId, false); } catch (IgniteCheckedException e) { @@ -766,7 +766,7 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu if (!wait) fut.onDone(); } - catch (ClusterTopologyCheckedException e) { + catch (ClusterTopologyCheckedException ignored) { // Remove previous mapping. mappings.remove(m.node().id()); @@ -963,7 +963,7 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu try { cctx.io().send(backup, req, tx.ioPolicy()); } - catch (ClusterTopologyCheckedException e) { + catch (ClusterTopologyCheckedException ignored) { mini.onNodeLeft(backupId, discoThread); } catch (IgniteCheckedException e) { @@ -1092,7 +1092,7 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu /** {@inheritDoc} */ @Override boolean onNodeLeft(UUID nodeId, boolean discoThread) { - return onResponse(nodeId, discoThread); + return onResponse(nodeId); } /** @@ -1100,15 +1100,14 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu * @param discoThread {@code True} if executed from discovery thread. */ void onDhtFinishResponse(UUID nodeId, boolean discoThread) { - onResponse(nodeId, discoThread); + onResponse(nodeId); } /** * @param nodeId Node ID. - * @param discoThread {@code True} if executed from discovery thread. * @return {@code True} if processed node response. */ - private boolean onResponse(UUID nodeId, boolean discoThread) { + private boolean onResponse(UUID nodeId) { boolean done; boolean ret; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java index a7dbe2a..0cd01fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java @@ -26,7 +26,6 @@ import org.apache.ignite.cache.query.annotations.QuerySqlFunction; import org.apache.ignite.cache.query.annotations.QueryTextField; import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.internal.util.lang.GridCloseableIterator; -import org.apache.ignite.lang.IgniteClosure; import org.apache.ignite.lang.IgniteReducer; import org.jetbrains.annotations.Nullable; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java index 8256270..ff1ac7f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java @@ -21,11 +21,9 @@ import java.nio.ByteBuffer; import java.util.LinkedHashMap; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; -import org.apache.ignite.IgniteException; import org.apache.ignite.internal.GridDirectTransient; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.A; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java index 10784fc..8927fb3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java @@ -1253,7 +1253,7 @@ public class CacheContinuousQueryHandler implements GridContinuousHandler try { cctx.io().send(node, msg, GridIoPolicy.SYSTEM_POOL); } - catch (ClusterTopologyCheckedException e) { + catch (ClusterTopologyCheckedException ignored) { IgniteLogger log = ctx.log(getClass()); if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java index fde1f52..1691fd7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java @@ -886,7 +886,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { key.prepareMarshal(context().cacheObjectContext()); - val.marshal(ctx, context()); + val.marshal(context()); if (transferExpiryPlc) { if (expiryPlcBytes == null) http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java index eaf1c87..7b7d56f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java @@ -527,7 +527,7 @@ public class IgniteTxHandler { if (!aff1.equals(aff2)) return true; } - catch (IllegalStateException err) { + catch (IllegalStateException ignored) { return true; } } @@ -1318,7 +1318,7 @@ public class IgniteTxHandler { else assert !ctx.discovery().alive(nodeId) : nodeId; } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException ignored) { if (txFinishMsgLog.isDebugEnabled()) { txFinishMsgLog.debug("Failed to gain entry processor return value. [txId=" + nearTxId + ", dhtTxId=" + req.version() + @@ -1498,7 +1498,7 @@ public class IgniteTxHandler { break; } - catch (GridCacheEntryRemovedException e) { + catch (GridCacheEntryRemovedException ignored) { if (log.isDebugEnabled()) log.debug("Got entry removed exception, will retry: " + entry.txKey()); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 3043ecc..4bdf94a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -1185,7 +1185,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements Ig break; } - catch (GridCacheEntryRemovedException rmvdErr) { + catch (GridCacheEntryRemovedException ignored) { txEntry.cached(entryEx(cacheCtx, txEntry.txKey(), topVer)); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index 24f8ea9..a1a18fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -31,7 +31,6 @@ import java.util.UUID; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteClientDisconnectedException; -import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.cluster.ClusterNode; @@ -282,7 +281,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { try { cctx.io().send(nodeId, ackReq, GridIoPolicy.SYSTEM_POOL); } - catch (ClusterTopologyCheckedException e) { + catch (ClusterTopologyCheckedException ignored) { if (log.isDebugEnabled()) log.debug("Failed to send one phase commit ack to backup node because it left grid: " + nodeId); } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java index 09b580b..76751de 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java @@ -40,7 +40,6 @@ import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentLinkedHashMap; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java index 8e2d6bd..916e4af 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java @@ -24,7 +24,6 @@ import org.apache.ignite.internal.IgniteCodeGeneratingFail; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.GridCacheOperation; -import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageReader; @@ -133,11 +132,10 @@ public class TxEntryValueHolder implements Message { } /** - * @param sharedCtx Shared cache context. * @param ctx Cache context. * @throws org.apache.ignite.IgniteCheckedException If marshaling failed. */ - public void marshal(GridCacheSharedContext sharedCtx, GridCacheContext ctx) + public void marshal(GridCacheContext ctx) throws IgniteCheckedException { if (hasWriteVal && val != null) val.prepareMarshal(ctx.cacheObjectContext()); @@ -248,4 +246,4 @@ public class TxEntryValueHolder implements Message { @Override public byte fieldsCount() { return 3; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java index 614c612..9f37f6e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java @@ -231,7 +231,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme cctx.affinity().partition(obj, false) : ctx.kernalContext().affinity().partition0(ctx.cacheName(), obj, null); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException ignored) { U.error(log, "Failed to get partition"); return -1; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java index a1900c8..8daef31 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java @@ -73,7 +73,7 @@ public class GridClockServer { try { locHost = U.getLocalHost(); } - catch (IOException e) { + catch (IOException ignored) { locHost = InetAddress.getLoopbackAddress(); U.warn(log, "Failed to get local host address, will use loopback address: " + locHost); @@ -219,4 +219,4 @@ public class GridClockServer { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java index fee4dd6..81ed662 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java @@ -21,7 +21,6 @@ import java.util.Collection; import java.util.UUID; import java.util.concurrent.DelayQueue; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.IgniteException; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteInterruptedCheckedException; @@ -437,4 +436,4 @@ public class DataStreamProcessor extends GridProcessorAdapter { X.println(">>> Data streamer processor memory stats [grid=" + ctx.gridName() + ']'); X.println(">>> ldrsSize: " + ldrs.size()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java index bb9ffdd..cf7fa41 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java @@ -1651,9 +1651,7 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed } GridDeployment dep = null; - GridPeerDeployAware jobPda0 = null; - - jobPda0 = jobPda; + GridPeerDeployAware jobPda0 = jobPda; if (ctx.deploy().enabled() && jobPda0 != null) { try { http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java index 7579ddb..8f7f7a8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java @@ -69,7 +69,7 @@ public class HadoopClasspathUtils { try { res.add(file.toURI().toURL()); } - catch (MalformedURLException e) { + catch (MalformedURLException ignored) { throw new IOException("Failed to convert file path to URL: " + file.getPath()); } } @@ -421,4 +421,4 @@ public class HadoopClasspathUtils { return normalize(name).equals(this.name); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java index c72140d..57bf70f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.processors.igfs; -import java.util.Set; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteFileSystem; import org.apache.ignite.cache.affinity.AffinityKeyMapper; @@ -481,4 +480,4 @@ public class IgfsProcessor extends IgfsProcessorAdapter { ", loc" + propName + "=" + locVal + ", ggfName=" + igfsName + ']'); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java index 474a940..928d65d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.processors.igfs.client; -import org.apache.ignite.igfs.IgfsFile; import org.apache.ignite.igfs.IgfsPath; import org.apache.ignite.internal.processors.igfs.IgfsContext; import org.apache.ignite.internal.util.typedef.internal.S; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractBootstrap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractBootstrap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractBootstrap.java index 8b4eb75..38cf36b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractBootstrap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractBootstrap.java @@ -22,7 +22,6 @@ import org.apache.ignite.Ignition; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgnitionEx; -import org.apache.ignite.internal.logger.platform.PlatformLogger; import org.apache.ignite.internal.processors.platform.memory.PlatformExternalMemory; import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream; import org.apache.ignite.internal.processors.resource.GridSpringResourceContext; @@ -77,4 +76,4 @@ public abstract class PlatformAbstractBootstrap implements PlatformBootstrap { protected void processInput(PlatformInputStream input, IgniteConfiguration cfg) { // No-op. } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java index 8f7c93b..1c791f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.processors.platform; -import org.apache.ignite.internal.logger.platform.PlatformLogger; import org.apache.ignite.internal.processors.platform.cache.PlatformCacheExtension; import org.apache.ignite.internal.logger.platform.PlatformLogger; import org.apache.ignite.internal.processors.platform.callback.PlatformCallbackGateway; @@ -59,4 +58,4 @@ public interface PlatformConfigurationEx { * @return Available cache extensions. */ @Nullable public Collection cacheExtensions(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java index cc09f5e..2abcc0d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java @@ -838,16 +838,16 @@ public class PlatformCache extends PlatformAbstractTarget { throws IgniteCheckedException { switch (type) { case OP_QRY_SQL: - return runQuery(reader, readSqlQuery(reader)); + return runQuery(readSqlQuery(reader)); case OP_QRY_SQL_FIELDS: - return runFieldsQuery(reader, readFieldsQuery(reader)); + return runFieldsQuery(readFieldsQuery(reader)); case OP_QRY_TXT: - return runQuery(reader, readTextQuery(reader)); + return runQuery(readTextQuery(reader)); case OP_QRY_SCAN: - return runQuery(reader, readScanQuery(reader)); + return runQuery(readScanQuery(reader)); case OP_QRY_CONTINUOUS: { long ptr = reader.readLong(); @@ -1180,7 +1180,7 @@ public class PlatformCache extends PlatformAbstractTarget { /** * Runs specified query. */ - private PlatformQueryCursor runQuery(BinaryRawReaderEx reader, Query qry) throws IgniteCheckedException { + private PlatformQueryCursor runQuery(Query qry) throws IgniteCheckedException { try { QueryCursorEx cursor = (QueryCursorEx) cache.query(qry); @@ -1196,7 +1196,7 @@ public class PlatformCache extends PlatformAbstractTarget { /** * Runs specified fields query. */ - private PlatformFieldsQueryCursor runFieldsQuery(BinaryRawReaderEx reader, Query qry) + private PlatformFieldsQueryCursor runFieldsQuery(Query qry) throws IgniteCheckedException { try { QueryCursorEx cursor = (QueryCursorEx) cache.query(qry); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java index 526e222..5971b6e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java @@ -674,7 +674,7 @@ public class PlatformUtils { try { innerMsg = e.getMessage(); } - catch (Exception innerErr) { + catch (Exception ignored) { innerMsg = "Exception message is not available."; } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 3286bac..a239ee2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -490,7 +490,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { return; } - catch (InterruptedException e) { + catch (InterruptedException ignored) { U.warn(log, "Interrupted while waiting for active queries cancellation."); Thread.currentThread().interrupt(); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java index 84d07b6..6ebff42 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.resource; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.Collection; + import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cache.store.CacheStoreSession; import org.apache.ignite.compute.ComputeJob; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java index a8062ca..31dac12 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java @@ -57,10 +57,8 @@ import org.apache.ignite.internal.processors.cache.GridCacheAdapter; import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; import org.apache.ignite.internal.processors.cache.IgniteInternalCache; import org.apache.ignite.internal.processors.cache.query.GridCacheSqlMetadata; -import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; import org.apache.ignite.internal.processors.rest.GridRestCommand; import org.apache.ignite.internal.processors.rest.GridRestResponse; -import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandler; import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandlerAdapter; import org.apache.ignite.internal.processors.rest.request.GridRestCacheRequest; import org.apache.ignite.internal.processors.rest.request.GridRestRequest; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java index 8a7adf4..7caadb8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java @@ -88,7 +88,7 @@ public class GridRedisSetCommandHandler extends GridRedisRestCommandHandler { try { l.close(); } - catch (IgniteException e) { + catch (IgniteException ignored) { U.warn(log, "Failed to remove atomic long for key [" + msg.key() + "]"); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java index d89e80b..d18ea5f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java @@ -1293,7 +1293,7 @@ class GridTaskWorker extends GridWorker implements GridTimeoutObject { nodeId + ", taskName=" + ses.getTaskName() + ", taskSesId=" + ses.getId() + ", jobSesId=" + res.getJobContext().getJobId() + ']', e); } - catch (IgniteClientDisconnectedCheckedException e0) { + catch (IgniteClientDisconnectedCheckedException ignored) { if (log.isDebugEnabled()) log.debug("Failed to send cancel request to node, client disconnected [nodeId=" + nodeId + ", taskName=" + ses.getTaskName() + ']'); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedSpinBusyLock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedSpinBusyLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedSpinBusyLock.java index a11b0b1..b8b9017 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedSpinBusyLock.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStripedSpinBusyLock.java @@ -106,7 +106,7 @@ public class GridStripedSpinBusyLock { try { Thread.sleep(10); } - catch (InterruptedException e) { + catch (InterruptedException ignored) { interrupt = true; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/util/HostAndPortRange.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/HostAndPortRange.java b/modules/core/src/main/java/org/apache/ignite/internal/util/HostAndPortRange.java index 60ace9c..3c63246 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/HostAndPortRange.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/HostAndPortRange.java @@ -113,7 +113,7 @@ public class HostAndPortRange { return port; } - catch (NumberFormatException e) { + catch (NumberFormatException ignored) { throw createParseError(addrStr, errMsgPrefix, "port range contains invalid port " + portStr); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 3dfb3c6..653302c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -235,7 +235,6 @@ import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; import sun.misc.SharedSecrets; import sun.misc.URLClassPath; -import sun.misc.Unsafe; import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISABLE_HOSTNAME_VERIFIER; import static org.apache.ignite.IgniteSystemProperties.IGNITE_HOME; @@ -9475,7 +9474,7 @@ public abstract class IgniteUtils { return fld; } - catch (NoSuchFieldException e) { + catch (NoSuchFieldException ignored) { // No-op. } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/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 e9ec74b..201cb34 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 @@ -433,7 +433,7 @@ public class StripedExecutor implements ExecutorService { } } } - catch (InterruptedException e) { + catch (InterruptedException ignored) { stopping = true; Thread.currentThread().interrupt(); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java index 9f7652b..cb10c1c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java @@ -25,7 +25,6 @@ import java.util.Map; import org.apache.ignite.configuration.FileSystemConfiguration; import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration; import org.apache.ignite.igfs.IgfsMode; -import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem; import org.apache.ignite.internal.LessNamingBean; import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.Nullable; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java index 06b7109..2ecdc8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java @@ -17,7 +17,6 @@ package org.apache.ignite.marshaller.jdk; -import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java index 160f2c1..fd885f2 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java @@ -882,7 +882,7 @@ class OptimizedClassDescriptor { return new Fields(fields); } - catch (Exception e) { + catch (Exception ignored) { return fields; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java index 923f385..849afa5 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java @@ -159,7 +159,7 @@ class OptimizedMarshallerUtils { try { mapOff = GridUnsafe.objectFieldOffset(HashSet.class.getDeclaredField("map")); } - catch (NoSuchFieldException e) { + catch (NoSuchFieldException ignored) { try { // Workaround for legacy IBM JRE. mapOff = GridUnsafe.objectFieldOffset(HashSet.class.getDeclaredField("backingMap")); @@ -307,7 +307,7 @@ class OptimizedMarshallerUtils { } } } - catch (NoSuchFieldException e) { + catch (NoSuchFieldException ignored) { // No-op. } catch (IllegalAccessException e) { http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index ae0e6f0..ddc7687 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -3771,7 +3771,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter e); } } - catch (IgniteClientDisconnectedException e0) { + catch (IgniteClientDisconnectedException ignored) { if (log.isDebugEnabled()) log.debug("Failed to ping node, client disconnected."); } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java index c56e18c..9271314 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java @@ -17,7 +17,6 @@ package org.apache.ignite.spi.communication.tcp; -import org.apache.ignite.internal.util.nio.GridNioServer; import org.apache.ignite.mxbean.MXBeanDescription; import org.apache.ignite.spi.IgniteSpiManagementMBean; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index 8928f28..6fff07f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -632,7 +632,7 @@ class ClientImpl extends TcpDiscoveryImpl { spi.writeToSocket(sock, msg, timeoutHelper.nextTimeoutChunk(spi.getSocketTimeout())); - spi.stats.onMessageSent(msg, U.currentTimeMillis() - tstamp, 0); + spi.stats.onMessageSent(msg, U.currentTimeMillis() - tstamp); if (log.isDebugEnabled()) log.debug("Message has been sent to address [msg=" + msg + ", addr=" + addr + @@ -1119,7 +1119,7 @@ class ClientImpl extends TcpDiscoveryImpl { } } } - catch (InterruptedException e) { + catch (InterruptedException ignored) { if (log.isDebugEnabled()) log.debug("Client socket writer interrupted."); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/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 7cc35e4..f491201 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 @@ -18,7 +18,6 @@ package org.apache.ignite.spi.discovery.tcp; import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.ObjectStreamException; @@ -1190,7 +1189,7 @@ class ServerImpl extends TcpDiscoveryImpl { int receipt = spi.readReceipt(sock, timeoutHelper.nextTimeoutChunk(ackTimeout0)); - spi.stats.onMessageSent(msg, tstamp0 - tstamp, U.currentTimeMillis() - tstamp0); + spi.stats.onMessageSent(msg, tstamp0 - tstamp); return receipt; } @@ -2939,7 +2938,7 @@ class ServerImpl extends TcpDiscoveryImpl { int res = spi.readReceipt(sock, timeoutHelper.nextTimeoutChunk(ackTimeout0)); - spi.stats.onMessageSent(pendingMsg, tstamp0 - tstamp, U.currentTimeMillis() - tstamp0); + spi.stats.onMessageSent(pendingMsg, tstamp0 - tstamp); if (log.isDebugEnabled()) log.debug("Pending message has been sent to next node [msgId=" + msg.id() + @@ -2988,7 +2987,7 @@ class ServerImpl extends TcpDiscoveryImpl { int res = spi.readReceipt(sock, timeoutHelper.nextTimeoutChunk(ackTimeout0)); - spi.stats.onMessageSent(msg, tstamp0 - tstamp, U.currentTimeMillis() - tstamp0); + spi.stats.onMessageSent(msg, tstamp0 - tstamp); onMessageExchanged(); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java index c790644..485e7a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java @@ -309,12 +309,10 @@ public class TcpDiscoveryStatistics { /** * Called by coordinator when ring message is sent. - * - * @param msg Sent message. + * @param msg Sent message. * @param time Time taken to serialize message. - * @param ackTime Time taken to receive message acknowledge. */ - public synchronized void onMessageSent(TcpDiscoveryAbstractMessage msg, long time, long ackTime) { + public synchronized void onMessageSent(TcpDiscoveryAbstractMessage msg, long time) { assert msg != null; assert time >= 0 : time; @@ -693,4 +691,4 @@ public class TcpDiscoveryStatistics { @Override public synchronized String toString() { return S.toString(TcpDiscoveryStatistics.class, this); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java index 1de44f7..e890109 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java @@ -401,8 +401,6 @@ public abstract class CacheJdbcPojoStoreAbstractSelfTest extends GridCommonAbstr Connection conn = getConnection(); try { - Random rnd = new Random(); - PreparedStatement stmt = conn.prepareStatement("SELECT ID, ORG_ID, BIRTHDAY, NAME, GENDER FROM PERSON WHERE ID = ?"); stmt.setInt(1, -1); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java index 849cab7..4a0b1da 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java @@ -25,7 +25,6 @@ import java.sql.Timestamp; import java.sql.Types; import java.util.ArrayList; import java.util.Collection; -import java.util.Random; import java.util.UUID; import java.util.concurrent.ConcurrentLinkedQueue; import javax.cache.integration.CacheWriterException; @@ -234,8 +233,6 @@ public class CacheJdbcPojoStoreTest extends GridAbstractCacheStoreSelfTest evts = pullEvents(tstamp, 10); return evts.get(evts.size() - 1).type() == EVT_JOB_FINISHED; } - catch (Exception e) { + catch (Exception ignored) { return false; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/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 a5f617d..47f7d2a 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 @@ -706,7 +706,7 @@ public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnect try { assertTrue(recvLatch.await(2, SECONDS)); } - catch (InterruptedException e) { + catch (InterruptedException ignored) { fail("Message wasn't received."); } @@ -751,7 +751,7 @@ public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnect try { assertEquals(42, (int)fut.get()); } - catch (Exception e) { + catch (Exception ignored) { fail("Failed submit task."); } @@ -864,4 +864,4 @@ public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnect stopAllGrids(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java index 7e217b7..79ba739 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java @@ -201,7 +201,7 @@ public abstract class IgniteClientReconnectFailoverAbstractTest extends IgniteCl try { barrier.await(10, SECONDS); } - catch (TimeoutException e) { + catch (TimeoutException ignored) { err = "Operations hang or fail with unexpected error."; break; @@ -235,4 +235,4 @@ public abstract class IgniteClientReconnectFailoverAbstractTest extends IgniteCl stop.set(true); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java index 31b4bc7..031fad9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java @@ -32,7 +32,6 @@ import org.apache.ignite.events.EventType; import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; -import org.apache.ignite.internal.processors.cache.GridCacheUtils; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.lang.IgnitePredicate; @@ -293,4 +292,4 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe G.stop(g.name(), false); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java index ba8fa5b..33adb59 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java @@ -160,7 +160,7 @@ public abstract class GridDiscoveryManagerAttributesSelfTest extends GridCommonA if (fail) fail("Node should not join"); } - catch (Exception e) { + catch (Exception ignored) { if (!fail) fail("Node should join"); } @@ -215,7 +215,7 @@ public abstract class GridDiscoveryManagerAttributesSelfTest extends GridCommonA if (fail) fail("Node should not join"); } - catch (Exception e) { + catch (Exception ignored) { if (!fail) fail("Node should join"); } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryObjectOffHeapUnswapTemporaryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryObjectOffHeapUnswapTemporaryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryObjectOffHeapUnswapTemporaryTest.java index 824481b..3ebf2da 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryObjectOffHeapUnswapTemporaryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryObjectOffHeapUnswapTemporaryTest.java @@ -43,7 +43,6 @@ import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED; import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES; http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java index 92e2b9b..6fa893c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java @@ -175,8 +175,8 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest { while (!fut.isDone()) client.compute().affinityCall(CACHE_NAME, key, new CheckCallable(key, null)); } - catch (ClusterTopologyException ignore) { - log.info("Expected error: " + ignore); + catch (ClusterTopologyException e) { + log.info("Expected error: " + e); } finally { stopAllGrids(); http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/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 2eab6d9..86bf70e 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 @@ -283,7 +283,7 @@ public abstract class CacheGetEntryAbstractTest extends GridCacheAbstractSelfTes tx.commit(); } - catch (TransactionOptimisticException e) { + catch (TransactionOptimisticException ignored) { assertTrue("Should not throw optimistic exception in only read TX. Tx isolation: " + txIsolation, false); } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java index e9be108..ac61091 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java @@ -969,7 +969,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { fail(); } - catch (TransactionOptimisticException e) { + catch (TransactionOptimisticException ignored) { // Expected exception. } @@ -2921,7 +2921,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { tx.commit(); } - catch (TransactionOptimisticException e) { + catch (TransactionOptimisticException ignored) { continue; } @@ -2982,7 +2982,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { tx.commit(); } - catch (TransactionOptimisticException e) { + catch (TransactionOptimisticException ignored) { continue; } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java index c7cd5ea..53cd621 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java @@ -77,7 +77,7 @@ public class CacheStartupInDeploymentModesTest extends GridCommonAbstractTest { deploymentMode = DeploymentMode.ISOLATED; marshaller = new OptimizedMarshaller(); - doCheckFailed(deploymentMode); + doCheckFailed(); } /** @@ -87,7 +87,7 @@ public class CacheStartupInDeploymentModesTest extends GridCommonAbstractTest { deploymentMode = DeploymentMode.PRIVATE; marshaller = new OptimizedMarshaller(); - doCheckFailed(deploymentMode); + doCheckFailed(); } /** @@ -133,10 +133,9 @@ public class CacheStartupInDeploymentModesTest extends GridCommonAbstractTest { } /** - * @param mode Deployment mode. * @throws Exception If failed. */ - private void doCheckFailed(DeploymentMode mode) throws Exception { + private void doCheckFailed() throws Exception { try { startGridsMultiThreaded(2); } http://git-wip-us.apache.org/repos/asf/ignite/blob/529a5455/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java index 515ae87..83dd244 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java @@ -743,7 +743,7 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest { fail(); } - catch (IllegalStateException e) { + catch (IllegalStateException ignored) { // No-op; } } @@ -773,8 +773,8 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest { fail(); } - catch (IllegalStateException e) { + catch (IllegalStateException ignored) { // No-op. } } -} \ No newline at end of file +}