Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6248C18438 for ; Tue, 1 Dec 2015 19:42:48 +0000 (UTC) Received: (qmail 68381 invoked by uid 500); 1 Dec 2015 19:42:48 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 68352 invoked by uid 500); 1 Dec 2015 19:42:48 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 68342 invoked by uid 99); 1 Dec 2015 19:42:48 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2015 19:42:48 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id B9AA3C12A0 for ; Tue, 1 Dec 2015 19:42:47 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.227 X-Spam-Level: * X-Spam-Status: No, score=1.227 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id ss8L6h9dQnmu for ; Tue, 1 Dec 2015 19:42:34 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 7C7A542BBD for ; Tue, 1 Dec 2015 19:42:33 +0000 (UTC) Received: (qmail 65477 invoked by uid 99); 1 Dec 2015 19:42:33 -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; Tue, 01 Dec 2015 19:42:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E6616E0513; Tue, 1 Dec 2015 19:42:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: abaker@apache.org To: commits@geode.incubator.apache.org Date: Tue, 01 Dec 2015 19:42:33 -0000 Message-Id: <1d548e10a3f347ce9d2ef634237d7551@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-geode git commit: GEODE-611: Change findbugs annotations to use ASL library GEODE-611: Change findbugs annotations to use ASL library Swtich the findbugs annotation dependency to use an ASL version from https://github.com/stephenc/findbugs-annotations. This library only supports the SuppressWarning annotation, not SuppressFBWarning so some source files were updated. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4d6df30a Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4d6df30a Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4d6df30a Branch: refs/heads/develop Commit: 4d6df30af1d4d6be997eb4b46fb57790c197c6de Parents: 5a9fdb8 Author: Anthony Baker Authored: Sun Nov 29 08:17:42 2015 -0800 Committer: Anthony Baker Committed: Tue Dec 1 11:38:16 2015 -0800 ---------------------------------------------------------------------- build.gradle | 1 + gemfire-core/build.gradle | 1 - .../com/gemstone/gemfire/SystemFailure.java | 4 +-- .../gemfire/admin/jmx/internal/AgentImpl.java | 15 +++++------ .../internal/GemFireHealthConfigJmxImpl.java | 14 +++++----- .../cache/query/internal/CompiledOperation.java | 4 +-- .../gemfire/internal/StatArchiveWriter.java | 28 +++++++++----------- .../internal/cache/AbstractUpdateOperation.java | 4 +-- .../internal/cache/TXStateProxyImpl.java | 4 +-- .../cache/tier/sockets/AcceptorImpl.java | 4 +-- .../cache/tier/sockets/BaseCommand.java | 18 +------------ .../tier/sockets/ClientProxyMembershipID.java | 5 +--- .../cache/versions/RegionVersionVector.java | 6 ++--- .../internal/datasource/AbstractPoolCache.java | 4 +-- .../internal/memcached/commands/GetCommand.java | 7 +---- .../internal/statistics/SampleCollector.java | 4 +-- .../gemfire/internal/util/DebuggerSupport.java | 4 +-- .../gemfire/internal/util/SingletonValue.java | 6 ++--- .../CustomEntryConcurrentHashMap.java | 8 ++---- gradle/dependency-versions.properties | 1 + 20 files changed, 46 insertions(+), 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 991488b..b5465b8 100755 --- a/build.gradle +++ b/build.gradle @@ -304,6 +304,7 @@ subprojects { compile 'org.springframework:spring-expression:' + project.'springframework.version' compile 'org.springframework:spring-web:' + project.'springframework.version' compile 'org.springframework:spring-webmvc:' + project.'springframework.version' + compile 'com.github.stephenc.findbugs:findbugs-annotations:' + project.'stephenc-findbugs.version' testCompile 'com.jayway.awaitility:awaitility:' + project.'awaitility.version' testCompile 'com.github.stefanbirkner:system-rules:' + project.'system-rules.version' http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/build.gradle ---------------------------------------------------------------------- diff --git a/gemfire-core/build.gradle b/gemfire-core/build.gradle index 8e45a97..dd3b765 100755 --- a/gemfire-core/build.gradle +++ b/gemfire-core/build.gradle @@ -19,7 +19,6 @@ dependencies { compile 'com.fasterxml.jackson.core:jackson-annotations:' + project.'jackson.version' compile 'com.fasterxml.jackson.core:jackson-core:' + project.'jackson.version' compile 'com.fasterxml.jackson.core:jackson-databind:' + project.'jackson.version' - compile 'com.google.code.findbugs:annotations:' + project.'annotations.version' provided 'com.google.guava:guava:' + project.'guava.version' compile 'commons-io:commons-io:' + project.'commons-io.version' compile 'commons-lang:commons-lang:' + project.'commons-lang.version' http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/SystemFailure.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/SystemFailure.java b/gemfire-core/src/main/java/com/gemstone/gemfire/SystemFailure.java index b37f257..494f5f7 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/SystemFailure.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/SystemFailure.java @@ -24,8 +24,6 @@ import com.gemstone.gemfire.internal.admin.remote.RemoteGfManagerAgent; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * Catches and responds to JVM failure *

@@ -190,7 +188,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; * @author jpenney * @since 5.1 */ -@SuppressFBWarnings(value="DM_GC", justification="This class performs System.gc as last ditch effort during out-of-memory condition.") +@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="DM_GC", justification="This class performs System.gc as last ditch effort during out-of-memory condition.") public final class SystemFailure { /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentImpl.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentImpl.java index 2acea99..4d1ad41 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentImpl.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentImpl.java @@ -44,6 +44,8 @@ import javax.management.remote.JMXServiceURL; import javax.management.remote.rmi.RMIConnectorServer; import javax.rmi.ssl.SslRMIClientSocketFactory; +import mx4j.tools.adaptor.http.HttpAdaptor; + import org.apache.logging.log4j.Logger; import com.gemstone.gemfire.GemFireException; @@ -56,6 +58,7 @@ import com.gemstone.gemfire.admin.jmx.Agent; import com.gemstone.gemfire.admin.jmx.AgentConfig; import com.gemstone.gemfire.admin.jmx.AgentFactory; import com.gemstone.gemfire.distributed.internal.DistributionManager; +import com.gemstone.gemfire.i18n.StringId; import com.gemstone.gemfire.internal.Banner; import com.gemstone.gemfire.internal.GemFireVersion; import com.gemstone.gemfire.internal.admin.remote.TailLogResponse; @@ -70,10 +73,6 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.logging.log4j.LogMarker; import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppender; import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppenders; -import com.gemstone.gemfire.i18n.StringId; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import mx4j.tools.adaptor.http.HttpAdaptor; /** * The GemFire JMX Agent provides the ability to administrate one GemFire @@ -406,7 +405,7 @@ implements com.gemstone.gemfire.admin.jmx.Agent, * * @return the object name of the system that the Agent is now connected to */ - @SuppressFBWarnings(value="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification="This is only a style warning.") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification="This is only a style warning.") public ObjectName connectToSystem() throws AdminException, MalformedObjectNameException { synchronized(CONN_SYNC) { @@ -454,7 +453,7 @@ implements com.gemstone.gemfire.admin.jmx.Agent, /** * Disconnects from the current DistributedSystem (if connected to one). */ - @SuppressFBWarnings(value="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification="This is only a style warning.") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification="This is only a style warning.") public void disconnectFromSystem() { synchronized(CONN_SYNC) { try { @@ -878,7 +877,7 @@ implements com.gemstone.gemfire.admin.jmx.Agent, /** * Creates a LogWriterI18n for this Agent to use in logging. */ - @SuppressFBWarnings(value="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE", justification="Return value for file delete is not important here.") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE", justification="Return value for file delete is not important here.") private void initLogWriter() throws com.gemstone.gemfire.admin.AdminException { final LogConfig logConfig = this.agentConfig.createLogConfig(); @@ -1570,7 +1569,7 @@ class ConnectionNotificationAdapter implements NotificationListener { * the listener. The MBean object should not use or modify the * object. (NOTE: copied from javax.management.NotificationListener) */ - @SuppressFBWarnings(value="BC_UNCONFIRMED_CAST", justification="Only JMXConnectionNotification instances are used.") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="BC_UNCONFIRMED_CAST", justification="Only JMXConnectionNotification instances are used.") public void handleNotification(Notification notification, Object handback) { if (handback instanceof AgentImpl) { AgentImpl agent = (AgentImpl) handback; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthConfigJmxImpl.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthConfigJmxImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthConfigJmxImpl.java index a55a616..c05d4b8 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthConfigJmxImpl.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthConfigJmxImpl.java @@ -16,13 +16,13 @@ */ package com.gemstone.gemfire.admin.jmx.internal; -import com.gemstone.gemfire.admin.*; -import com.gemstone.gemfire.admin.internal.*; +import javax.management.ObjectName; +import javax.management.modelmbean.ModelMBean; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - -import javax.management.*; -import javax.management.modelmbean.*; +import com.gemstone.gemfire.admin.AdminException; +import com.gemstone.gemfire.admin.GemFireHealth; +import com.gemstone.gemfire.admin.GemFireHealthConfig; +import com.gemstone.gemfire.admin.internal.GemFireHealthConfigImpl; /** * The JMX "managed resource" that represents the configuration for @@ -46,7 +46,7 @@ import javax.management.modelmbean.*; * * @since 3.5 */ -@SuppressFBWarnings(justification="This class is deprecated. Also, any further changes so close to the release is inadvisable.") +@edu.umd.cs.findbugs.annotations.SuppressWarnings(justification="This class is deprecated. Also, any further changes so close to the release is inadvisable.") public class GemFireHealthConfigJmxImpl implements GemFireHealthConfig, ManagedResource, java.io.Serializable { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledOperation.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledOperation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledOperation.java index 957f0fe..d9f0d6c 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledOperation.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledOperation.java @@ -41,8 +41,6 @@ import com.gemstone.gemfire.pdx.PdxSerializationException; import com.gemstone.gemfire.pdx.internal.PdxInstanceImpl; import com.gemstone.gemfire.pdx.internal.PdxString; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * Class Description * @@ -223,7 +221,7 @@ public class CompiledOperation extends AbstractCompiledValue { return context.addDependencies(this, rcvr.computeDependencies(context)); } - @SuppressFBWarnings(value="RV_RETURN_VALUE_OF_PUTIFABSENT_IGNORED", justification="Does not matter if the methodDispatch that isn't stored in the map is used") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="RV_RETURN_VALUE_OF_PUTIFABSENT_IGNORED", justification="Does not matter if the methodDispatch that isn't stored in the map is used") private Object eval0(Object receiver, Class resolutionType, ExecutionContext context) throws TypeMismatchException, FunctionDomainException, NameResolutionException, QueryInvocationTargetException { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/StatArchiveWriter.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/StatArchiveWriter.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/StatArchiveWriter.java index c2bf3bd..562cce3 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/StatArchiveWriter.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/StatArchiveWriter.java @@ -16,19 +16,6 @@ */ package com.gemstone.gemfire.internal; -import com.gemstone.gemfire.GemFireIOException; -import com.gemstone.gemfire.InternalGemFireException; -import com.gemstone.gemfire.StatisticDescriptor; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.log4j.LogMarker; -import com.gemstone.gemfire.internal.statistics.ResourceInstance; -import com.gemstone.gemfire.internal.statistics.ResourceType; -import com.gemstone.gemfire.internal.statistics.SampleHandler; -import com.gemstone.gemfire.internal.statistics.StatArchiveDescriptor; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import java.io.BufferedOutputStream; import java.io.DataInput; import java.io.DataOutput; @@ -49,6 +36,17 @@ import java.util.zip.GZIPOutputStream; import org.apache.logging.log4j.Logger; +import com.gemstone.gemfire.GemFireIOException; +import com.gemstone.gemfire.InternalGemFireException; +import com.gemstone.gemfire.StatisticDescriptor; +import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import com.gemstone.gemfire.internal.logging.LogService; +import com.gemstone.gemfire.internal.logging.log4j.LogMarker; +import com.gemstone.gemfire.internal.statistics.ResourceInstance; +import com.gemstone.gemfire.internal.statistics.ResourceType; +import com.gemstone.gemfire.internal.statistics.SampleHandler; +import com.gemstone.gemfire.internal.statistics.StatArchiveDescriptor; + /** * StatArchiveWriter provides APIs to write statistic snapshots to an archive * file. @@ -168,7 +166,7 @@ public class StatArchiveWriter implements StatArchiveFormat, SampleHandler { } } - @SuppressFBWarnings(value="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE", justification="Best effort attempt to delete a GFS file without any samples.") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE", justification="Best effort attempt to delete a GFS file without any samples.") private static void deleteFileIfPossible(File file) { file.delete(); } @@ -288,7 +286,7 @@ public class StatArchiveWriter implements StatArchiveFormat, SampleHandler { } } - @SuppressFBWarnings(value="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification="This is only for debugging and there is never more than one instance being traced because there is only one stat sampler.") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification="This is only for debugging and there is never more than one instance being traced because there is only one stat sampler.") public void allocatedResourceInstance(ResourceInstance statResource) { if (logger.isTraceEnabled(LogMarker.STATISTICS)) { logger.trace(LogMarker.STATISTICS, "StatArchiveWriter#allocatedResourceInstance statResource={}", statResource); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractUpdateOperation.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractUpdateOperation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractUpdateOperation.java index b94ce8b..3ac006b 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractUpdateOperation.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractUpdateOperation.java @@ -45,8 +45,6 @@ import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LogMarker; import com.gemstone.gemfire.internal.util.DelayedAction; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * Common code for both UpdateOperation and DistributedPutAllOperation. * @@ -57,7 +55,7 @@ public abstract class AbstractUpdateOperation extends DistributedCacheOperation public static volatile boolean test_InvalidVersion; - @SuppressFBWarnings(value="UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", justification="test hook that is unset normally") public static volatile DelayedAction test_InvalidVersionAction; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateProxyImpl.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateProxyImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateProxyImpl.java index 533a1f0..fda1a3a 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateProxyImpl.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateProxyImpl.java @@ -50,8 +50,6 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * @author mthomas * @@ -570,7 +568,7 @@ public class TXStateProxyImpl implements TXStateProxy { /* (non-Javadoc) * @see com.gemstone.gemfire.internal.cache.InternalDataView#entryCount(com.gemstone.gemfire.internal.cache.LocalRegion) */ - @SuppressFBWarnings(value="UL_UNRELEASED_LOCK", justification="This method unlocks and then conditionally undoes the unlock in the finally-block. Review again at later time.") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UL_UNRELEASED_LOCK", justification="This method unlocks and then conditionally undoes the unlock in the finally-block. Review again at later time.") public int entryCount(LocalRegion localRegion) { // if size is the first operation in the transaction, then reset the txState boolean resetTXState = this.realDeal == null; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java index c30102f..89c073f 100755 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java @@ -92,8 +92,6 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.tcp.ConnectionTable; import com.gemstone.gemfire.internal.util.ArrayUtils; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * Implements the acceptor thread on the bridge server. Accepts connections from * the edge and starts up threads to process requests from these. @@ -1610,7 +1608,7 @@ public class AcceptorImpl extends Acceptor implements Runnable } @Override - @SuppressFBWarnings(value="REC_CATCH_EXCEPTION", justification="Allow this thread to die") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="REC_CATCH_EXCEPTION", justification="Allow this thread to die") public void close() { if (!isRunning()) { return; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommand.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommand.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommand.java index 1e6b8d8..52ea6f5 100755 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommand.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommand.java @@ -47,25 +47,12 @@ import com.gemstone.gemfire.cache.CacheWriterException; import com.gemstone.gemfire.cache.InterestResultPolicy; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.TransactionDataNodeHasDepartedException; -import com.gemstone.gemfire.cache.TransactionDataRebalancedException; import com.gemstone.gemfire.cache.TransactionException; -import com.gemstone.gemfire.cache.operations.QueryOperationContext; import com.gemstone.gemfire.cache.persistence.PartitionOfflineException; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryException; -import com.gemstone.gemfire.cache.query.QueryInvalidException; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.Struct; -import com.gemstone.gemfire.cache.query.internal.CqEntry; -import com.gemstone.gemfire.cache.query.internal.DefaultQuery; -import com.gemstone.gemfire.cache.query.internal.types.CollectionTypeImpl; -import com.gemstone.gemfire.cache.query.internal.types.StructTypeImpl; import com.gemstone.gemfire.cache.query.types.CollectionType; import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; import com.gemstone.gemfire.distributed.internal.DistributionStats; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.i18n.LogWriterI18n; import com.gemstone.gemfire.internal.Assert; import com.gemstone.gemfire.internal.Version; import com.gemstone.gemfire.internal.cache.CachedDeserializable; @@ -92,12 +79,9 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.offheap.OffHeapHelper; -import com.gemstone.gemfire.internal.security.AuthorizeRequestPP; import com.gemstone.gemfire.internal.sequencelog.EntryLogger; import com.gemstone.gemfire.security.GemFireSecurityException; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * @author ashahid * @@ -1162,7 +1146,7 @@ public abstract class BaseCommand implements Command { * Handles both RR and PR cases */ @SuppressWarnings("rawtypes") - @SuppressFBWarnings(value="NP_NULL_PARAM_DEREF", justification="Null value handled in sendNewRegisterInterestResponseChunk()") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NP_NULL_PARAM_DEREF", justification="Null value handled in sendNewRegisterInterestResponseChunk()") private static void handleKVSingleton(LocalRegion region, Object entryKey, boolean serializeValues, ServerConnection servConn) throws IOException { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java index 4e7a179..daa07f4 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java @@ -39,15 +39,12 @@ import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedM import com.gemstone.gemfire.internal.Assert; import com.gemstone.gemfire.internal.DataSerializableFixedID; import com.gemstone.gemfire.internal.HeapDataOutputStream; -import com.gemstone.gemfire.internal.InternalDataSerializer; import com.gemstone.gemfire.internal.Version; import com.gemstone.gemfire.internal.VersionedDataInputStream; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * This class represents a ConnectionProxy of the CacheClient * @@ -484,7 +481,7 @@ public final class ClientProxyMembershipID /** * call this when the distributed system ID has been modified */ - @SuppressFBWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification = "Only applicable in client DS and in that case too multiple instances do not modify it at the same time.") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification = "Only applicable in client DS and in that case too multiple instances do not modify it at the same time.") public void updateID(DistributedMember idm) { // this.transientPort = ((InternalDistributedMember)this.memberId).getPort(); // if (this.transientPort == 0) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionVector.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionVector.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionVector.java index 1416b62..61423d1 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionVector.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionVector.java @@ -52,8 +52,6 @@ import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.logging.log4j.LogMarker; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * RegionVersionVector tracks the highest region-level version number of * operations applied to a region for each member that has the region.

@@ -296,7 +294,7 @@ public abstract class RegionVersionVector> implements // this could block for a while if a limit has been set on the waiting-thread-pool dm.getWaitingThreadPool().execute( new Runnable() { - @SuppressFBWarnings(value={"UL_UNRELEASED_LOCK","IMSE_DONT_CATCH_IMSE"}) + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value={"UL_UNRELEASED_LOCK","IMSE_DONT_CATCH_IMSE"}) public void run() { boolean haveLock = false; synchronized(clearLockSync) { @@ -667,7 +665,7 @@ public abstract class RegionVersionVector> implements * each oplog we recover. * @param latestOplog */ - @SuppressFBWarnings(value="ML_SYNC_ON_FIELD_TO_GUARD_CHANGING_THAT_FIELD", + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="ML_SYNC_ON_FIELD_TO_GUARD_CHANGING_THAT_FIELD", justification="sync on localExceptions guards concurrent modification but this is a replacement") public void initRecoveredVersion(T member, RegionVersionHolder v, boolean latestOplog) { RegionVersionHolder recovered = v.clone(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCache.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCache.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCache.java index a42cd6f..b615327 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCache.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCache.java @@ -36,8 +36,6 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * AbstractPoolCache implements the ConnectionPoolCache interface. This is base * class for the all connection pools. The class also implements the @@ -88,7 +86,7 @@ public abstract class AbstractPoolCache implements ConnectionPoolCache, * configuration for the pool. * @throws PoolException */ - @SuppressFBWarnings(value="SC_START_IN_CTOR", + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="SC_START_IN_CTOR", justification="the thread started is a cleanup thread and is not active until there is a timeout tx") public AbstractPoolCache(EventListener eventListner, ConfiguredDataSourceProperties configs) throws PoolException { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/memcached/commands/GetCommand.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/memcached/commands/GetCommand.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/memcached/commands/GetCommand.java index da1ef53..8fd0847 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/memcached/commands/GetCommand.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/memcached/commands/GetCommand.java @@ -18,8 +18,6 @@ package com.gemstone.gemfire.internal.memcached.commands; import java.nio.ByteBuffer; import java.nio.CharBuffer; -import java.nio.charset.CharacterCodingException; -import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import java.util.Map; @@ -28,7 +26,6 @@ import java.util.Set; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.internal.memcached.Command; import com.gemstone.gemfire.internal.memcached.KeyWrapper; import com.gemstone.gemfire.internal.memcached.Reply; import com.gemstone.gemfire.internal.memcached.RequestReader; @@ -36,8 +33,6 @@ import com.gemstone.gemfire.internal.memcached.ResponseStatus; import com.gemstone.gemfire.internal.memcached.ValueWrapper; import com.gemstone.gemfire.memcached.GemFireMemcachedServer.Protocol; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * * The retrieval commands "get" and "gets" operates like this:
@@ -167,7 +162,7 @@ public class GetCommand extends AbstractCommand { return composeReply(results, isGets); } - @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF", + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "NP_NULL_PARAM_DEREF", justification = "findbugs complains that v is null while putting into buffer, but it is not") private ByteBuffer composeReply(Map results, boolean isGets) { Iterator> it = results.entrySet().iterator(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java index ee00ff2..9b40e95 100755 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java @@ -37,8 +37,6 @@ import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.logging.log4j.LogMarker; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * Captures sample of statistics. The SampleCollector contains maps of * StatisticsTypes to ResourceTypes and Statistics instances to @@ -148,7 +146,7 @@ public class SampleCollector { * @param config defines the configuration for the StatArchiveHandler * @param nanosTimeStamp the nanos time stamp to initialize stat archiver with */ - @SuppressFBWarnings(value="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification="There is never more than one SampleCollector instance.") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification="There is never more than one SampleCollector instance.") public void initialize(StatArchiveHandlerConfig config, long nanosTimeStamp) { synchronized (SampleCollector.class) { instance = this; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/DebuggerSupport.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/DebuggerSupport.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/DebuggerSupport.java index a5f8343..49ce32e 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/DebuggerSupport.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/DebuggerSupport.java @@ -20,8 +20,6 @@ package com.gemstone.gemfire.internal.util; import com.gemstone.gemfire.i18n.LogWriterI18n; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * * @author Eric Zoerner @@ -38,7 +36,7 @@ public abstract class DebuggerSupport { waitForJavaDebugger(logger, null); } - @SuppressFBWarnings(value="IL_INFINITE_LOOP", justification="Endless loop is for debugging purposes.") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="IL_INFINITE_LOOP", justification="Endless loop is for debugging purposes.") public static void waitForJavaDebugger(LogWriterI18n logger, String extraLogMsg) { boolean cont = false; String msg = ":"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/SingletonValue.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/SingletonValue.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/SingletonValue.java index c04e467..5f902b6 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/SingletonValue.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/SingletonValue.java @@ -22,8 +22,6 @@ import java.io.InterruptedIOException; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * A builder that caches the singleton value. * @@ -205,7 +203,7 @@ public class SingletonValue { } } - @SuppressFBWarnings( + @edu.umd.cs.findbugs.annotations.SuppressWarnings( value="UL_UNRELEASED_LOCK", justification="findbugs is wrong and Darrel agrees") public T get() throws IOException { @@ -263,7 +261,7 @@ public class SingletonValue { } } - @SuppressFBWarnings( + @edu.umd.cs.findbugs.annotations.SuppressWarnings( value="UL_UNRELEASED_LOCK", justification="findbugs is wrong and Darrel agrees") private T acquireValue() throws IOException { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java index ad38724..75dc330 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java @@ -51,7 +51,6 @@ package com.gemstone.gemfire.internal.util.concurrent; import java.io.IOException; import java.io.Serializable; -import java.lang.reflect.Array; import java.util.AbstractCollection; import java.util.AbstractMap; import java.util.AbstractSet; @@ -59,7 +58,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Enumeration; -import java.util.HashSet; import java.util.IdentityHashMap; import java.util.Iterator; import java.util.Map; @@ -78,8 +76,6 @@ import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper; import com.gemstone.gemfire.internal.size.SingleObjectSizer; import com.gemstone.gemfire.internal.util.ArrayUtils; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * A hash table supporting full concurrency of retrievals and adjustable * expected concurrency for updates. This class obeys the same functional @@ -1436,7 +1432,7 @@ RETRYLOOP: * @return the number of key-value mappings in this map */ @Override - @SuppressFBWarnings(value="UL_UNRELEASED_LOCK", justification="The lock() calls are followed by unlock() calls without finally-block. Leaving this as is because it's lifted from JDK code and we want to minimize changes.") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UL_UNRELEASED_LOCK", justification="The lock() calls are followed by unlock() calls without finally-block. Leaving this as is because it's lifted from JDK code and we want to minimize changes.") public final int size() { final Segment[] segments = this.segments; long sum = 0; @@ -1536,7 +1532,7 @@ RETRYLOOP: * if the specified value is null */ @Override - @SuppressFBWarnings(value="UL_UNRELEASED_LOCK", justification="Leaving this as is because it's lifted from JDK code and we want to minimize changes.") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UL_UNRELEASED_LOCK", justification="Leaving this as is because it's lifted from JDK code and we want to minimize changes.") public final boolean containsValue(final Object value) { if (value == null) { throw new NullPointerException(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4d6df30a/gradle/dependency-versions.properties ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties index 4c3c16e..3e6b6a5 100644 --- a/gradle/dependency-versions.properties +++ b/gradle/dependency-versions.properties @@ -58,6 +58,7 @@ spring-data-gemfire.version = 1.5.1.RELEASE spring-hateos.version = 0.16.0.RELEASE spring-shell.version = 1.0.0.RELEASE springframework.version = 3.2.12.RELEASE +stephenc-findbugs.version = 1.3.9-1 spymemcached.version = 2.9.0 swagger.version = 1.3.2 swagger-springmvc.version = 0.8.2