From 306053e6955ab66794c47e7417a94c0227f92d9f Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 13 Sep 2018 12:07:13 +0200
Subject: [PATCH] Enable findbugs in mockito-configuration

This fixes warnings reported and flips the switch.

Change-Id: I4f035e4c3a9c7bc4a764668abb6adb9b8d952c9c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 common/mockito-configuration/pom.xml                       | 7 +++++++
 .../mockito/configuration/ArgumentsExtractorVerifier.java  | 5 ++---
 .../configuration/ThrowsUnstubbedMethodException.java      | 2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml
index ff7debab94..fd6e0c7bb3 100644
--- a/common/mockito-configuration/pom.xml
+++ b/common/mockito-configuration/pom.xml
@@ -46,6 +46,13 @@
                     <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <configuration>
+                    <failOnError>true</failOnError>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
diff --git a/common/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java b/common/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java
index 4112923212..ec7fc8e225 100644
--- a/common/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java
+++ b/common/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java
@@ -19,7 +19,7 @@ import org.mockito.verification.VerificationMode;
  * Verifier that extracts arguments from actual invocation. Useful when deeper validation of arguments is needed.
  */
 public class ArgumentsExtractorVerifier implements VerificationMode {
-    private Object[] arguments;
+    private Object[] arguments = null;
 
     @Override
     public void verify(final VerificationData data) {
@@ -32,7 +32,6 @@ public class ArgumentsExtractorVerifier implements VerificationMode {
         Invocation invocation = actualInvocations.get(0);
         arguments = invocation.getArguments();
         invocation.markVerified();
-
     }
 
     @Override
@@ -41,6 +40,6 @@ public class ArgumentsExtractorVerifier implements VerificationMode {
     }
 
     public Object[] getArguments() {
-        return arguments;
+        return arguments == null ? null : arguments.clone();
     }
 }
diff --git a/common/mockito-configuration/src/main/java/org/mockito/configuration/ThrowsUnstubbedMethodException.java b/common/mockito-configuration/src/main/java/org/mockito/configuration/ThrowsUnstubbedMethodException.java
index d039130588..e08b755bb6 100644
--- a/common/mockito-configuration/src/main/java/org/mockito/configuration/ThrowsUnstubbedMethodException.java
+++ b/common/mockito-configuration/src/main/java/org/mockito/configuration/ThrowsUnstubbedMethodException.java
@@ -7,6 +7,7 @@
  */
 package org.mockito.configuration;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.Serializable;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
@@ -14,6 +15,7 @@ import org.mockito.stubbing.Answer;
 /**
  * Answer that throws {@link UnstubbedMethodException}.
  */
+@SuppressFBWarnings("NM_CLASS_NOT_EXCEPTION")
 public class ThrowsUnstubbedMethodException implements Answer<Object>, Serializable {
     private static final long serialVersionUID = 1L;
 
-- 
2.36.6