Fix some static analysis errors (#110)

dzieciou · Feb 12, 2023 · ffc000b · ffc000b
1 parent be39942
commit ffc000b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 52 deletions.
diff --git a/pom.xml b/pom.xml
@@ -80,6 +80,11 @@
             <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>4.11.0</version>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>

diff --git a/src/main/java/com/github/dzieciou/testing/curl/Http2Curl.java b/src/main/java/com/github/dzieciou/testing/curl/Http2Curl.java
@@ -162,7 +162,7 @@ public String generateCurl(HttpRequest request) throws Exception {
   private static class Headers {
 
     List<Header> toProcess;
-    Set<String> ignored;
+    final Set<String> ignored;
 
     public Headers(List<Header> toProcess) {
       this.toProcess = toProcess;

diff --git a/src/test/java/com/github/dzieciou/testing/curl/CurlRestAssuredConfigFactoryTest.java b/src/test/java/com/github/dzieciou/testing/curl/CurlRestAssuredConfigFactoryTest.java
@@ -11,11 +11,8 @@
 import io.restassured.config.HttpClientConfig;
 import io.restassured.config.RestAssuredConfig;
 import io.restassured.specification.RequestSpecification;
-import java.io.IOException;
-import org.apache.http.HttpException;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.AbstractHttpClient;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.protocol.HttpContext;
@@ -26,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockserver.client.MockServerClient;
 
+@SuppressWarnings("deprecation") // AbstractHttpClient is deprecated but used by REST-assured
 public class CurlRestAssuredConfigFactoryTest {
 
   private static final int MOCK_PORT = 9999;
@@ -54,13 +52,10 @@ public void shouldIncludeCurlInterceptorWhenUpdatingExistingConfig() {
         HttpClientConfig.httpClientConfig()
             .setParam("TestParam", "TestValue")
             .httpClientFactory(
-                new HttpClientConfig.HttpClientFactory() {
-                  @Override
-                  public HttpClient createHttpClient() {
-                    DefaultHttpClient client = new DefaultHttpClient();
-                    client.addRequestInterceptor(new MyRequestInerceptor());
-                    return client;
-                  }
+                () -> {
+                  DefaultHttpClient client = new DefaultHttpClient();
+                  client.addRequestInterceptor(new MyRequestInerceptor());
+                  return client;
                 });
     final RestAssuredConfig config = RestAssuredConfig.config().httpClient(httpClientConfig);
 
@@ -147,7 +142,6 @@ public void describeTo(Description description) {}
   private static class MyRequestInerceptor implements HttpRequestInterceptor {
 
     @Override
-    public void process(HttpRequest httpRequest, HttpContext httpContext)
-        throws HttpException, IOException {}
+    public void process(HttpRequest httpRequest, HttpContext httpContext) {}
   }
 }
diff --git a/src/test/java/com/github/dzieciou/testing/curl/TemporaryFolder.java b/src/test/java/com/github/dzieciou/testing/curl/TemporaryFolder.java
@@ -20,6 +20,7 @@ public Path createFile() throws IOException {
   public void deleteAll() {
     try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(this.dir)) {
       for (Path fpath : directoryStream) {
+        //noinspection ResultOfMethodCallIgnored
         fpath.toFile().delete();
       }
     } catch (IOException ignored) {

diff --git a/src/test/java/com/github/dzieciou/testing/curl/UsingWithRestAssuredTest.java b/src/test/java/com/github/dzieciou/testing/curl/UsingWithRestAssuredTest.java
@@ -4,7 +4,6 @@
 import static io.restassured.RestAssured.given;
 import static io.restassured.config.HttpClientConfig.httpClientConfig;
 import static io.restassured.config.MultiPartConfig.multiPartConfig;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockserver.integration.ClientAndServer.startClientAndServer;
 import static org.mockserver.model.HttpRequest.request;
@@ -22,7 +21,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 import org.apache.commons.io.FileUtils;
-import org.apache.http.HttpException;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.http.client.HttpClient;
@@ -34,8 +32,12 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockserver.client.MockServerClient;
 
+@ExtendWith(MockitoExtension.class)
 public class UsingWithRestAssuredTest {
 
   private static final int MOCK_PORT = 9999;
@@ -45,6 +47,8 @@ public class UsingWithRestAssuredTest {
   private static MockServerClient mockServer;
   private static TemporaryFolder tempFolder;
 
+  @Mock public Consumer<String> curlConsumer;
+
   private RestAssuredConfig getRestAssuredConfig(Consumer<String> curlConsumer) {
     return config()
         .httpClient(
@@ -63,9 +67,6 @@ public static void setupMock() throws IOException {
   @Test
   @Tag("end-to-end-samples")
   public void cookiesTest() {
-
-    Consumer<String> curlConsumer = mock(Consumer.class);
-
     given()
         .redirects()
         .follow(false)
@@ -95,9 +96,6 @@ public void cookiesTest() {
   @Test
   @Tag("end-to-end-samples")
   public void cookieWithSpecialCharactersTest() {
-
-    Consumer<String> curlConsumer = mock(Consumer.class);
-
     given()
         .redirects()
         .follow(false)
@@ -133,9 +131,6 @@ public void cookieWithSpecialCharactersTest() {
   @Test
   @Tag("end-to-end-samples")
   public void customizedCookie() {
-
-    Consumer<String> curlConsumer = mock(Consumer.class);
-
     List<Cookie> cookies = new ArrayList<>();
     cookies.add(
         new Cookie.Builder("token", "tokenValue")
@@ -170,9 +165,6 @@ public void customizedCookie() {
   @Test
   @Tag("end-to-end-samples")
   public void basicIntegrationTest() {
-
-    Consumer<String> curlConsumer = mock(Consumer.class);
-
     given()
         .redirects()
         .follow(false)
@@ -191,9 +183,6 @@ public void basicIntegrationTest() {
   @Test
   @Tag("end-to-end-samples")
   public void shouldPrintPostRequestWithMultipartDataProperly() {
-
-    Consumer<String> curlConsumer = mock(Consumer.class);
-
     given()
         .baseUri(MOCK_BASE_URI)
         .port(MOCK_PORT)
@@ -215,9 +204,6 @@ public void shouldPrintPostRequestWithMultipartDataProperly() {
   @Test
   @Tag("end-to-end-samples")
   public void shouldPrintBody() {
-
-    Consumer<String> curlConsumer = mock(Consumer.class);
-
     given()
         .baseUri(MOCK_BASE_URI)
         .port(MOCK_PORT)
@@ -238,9 +224,6 @@ public void shouldPrintBody() {
   @Test
   @Tag("end-to-end-samples")
   public void shouldPrintBodyWithEncoding() {
-
-    Consumer<String> curlConsumer = mock(Consumer.class);
-
     given()
         .baseUri(MOCK_BASE_URI)
         .port(MOCK_PORT)
@@ -263,9 +246,6 @@ public void shouldPrintBodyWithEncoding() {
   @Test
   @Tag("end-to-end-samples")
   public void shouldPrintMultipartWithContentTypesForTypes() {
-
-    Consumer<String> curlConsumer = mock(Consumer.class);
-
     given()
         .baseUri(MOCK_BASE_URI)
         .port(MOCK_PORT)
@@ -285,9 +265,6 @@ public void shouldPrintMultipartWithContentTypesForTypes() {
 
   @Test
   public void shouldPrintMultipartWithMixedType() {
-
-    Consumer<String> curlConsumer = mock(Consumer.class);
-
     given()
         .baseUri(MOCK_BASE_URI)
         .port(MOCK_PORT)
@@ -308,8 +285,6 @@ public void shouldPrintMultipartWithMixedType() {
 
   @Test
   public void shouldPrintFileAsBinary() throws IOException {
-    Consumer<String> curlConsumer = mock(Consumer.class);
-
     File tempFile = tempFolder.createFile().toFile();
     FileUtils.writeStringToFile(tempFile, "{ 'message' : 'hello world'}", Charset.defaultCharset());
 
@@ -331,8 +306,6 @@ public void shouldPrintFileAsBinary() throws IOException {
 
   @Test
   public void shouldPrintForm() {
-    Consumer<String> curlConsumer = mock(Consumer.class);
-
     given()
         .baseUri(MOCK_BASE_URI)
         .port(MOCK_PORT)
@@ -354,9 +327,6 @@ public void shouldPrintForm() {
   @Test
   @Tag("end-to-end-samples")
   public void shouldPrintPut() {
-
-    Consumer<String> curlConsumer = mock(Consumer.class);
-
     given()
         .redirects()
         .follow(false)
@@ -409,9 +379,7 @@ public CurlTestingInterceptor(Consumer<String> curlConsumer) {
     }
 
     @Override
-    public void process(HttpRequest request, HttpContext context)
-        throws HttpException, IOException {
-
+    public void process(HttpRequest request, HttpContext context) {
       Options options =
           Options.builder()
               .printSingleliner()