Clean up inspection warnings (#12)

* Clean up warnings

* Refactor

Author: lwj5

checkstyle.xml

@@ -74,6 +74,9 @@
     <!-- Checks for Size Violations.                    -->
     <!-- See http://checkstyle.sf.net/config_sizes.html -->
     <module name="FileLength"/>
+    <module name="LineLength">
+        <property name="max" value="120"/>
+    </module>
 
     <!-- Checks for whitespace                               -->
     <!-- See http://checkstyle.sf.net/config_whitespace.html -->
@@ -133,9 +136,6 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <property name="max" value="120"/>
-        </module>
         <module name="MethodLength"/>
         <module name="ParameterNumber">
             <property name="max" value="8"/>

pom.xml

@@ -84,7 +84,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M2</version>
+                <version>3.0.0-M3</version>
                 <executions>
                     <execution>
                         <id>enforce-no-snapshots</id>
@@ -189,7 +189,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.1.1</version>
                 <executions>
                     <execution>
                         <id>validate</id>

src/main/java/ai/preferred/venom/fetcher/AsyncFetcher.java

@@ -144,31 +144,6 @@ public final class AsyncFetcher implements Fetcher {
    */
   private final boolean compressed;
 
-  /**
-   * Creates {@link BasicFuture} and fails the request with a specified exception.
-   *
-   * @param callback request callback
-   * @param ex       specified exeption
-   * @return BasicFuture created
-   */
-  private static Future<Response> failRequest(final FutureCallback<Response> callback, final Exception ex) {
-    final BasicFuture<Response> f = new BasicFuture<>(callback);
-    f.failed(ex);
-    return f;
-  }
-
-  /**
-   * Creates {@link BasicFuture} and cancels the request.
-   *
-   * @param callback request callback
-   * @return BasicFuture created
-   */
-  private static Future<Response> cancelRequest(final FutureCallback<Response> callback) {
-    final BasicFuture<Response> f = new BasicFuture<>(callback);
-    f.cancel(true);
-    return f;
-  }
-
   /**
    * Constructs an instance of AsyncFetcher.
    *
@@ -242,6 +217,31 @@ private AsyncFetcher(final Builder builder) {
     httpClient = clientBuilder.build();
   }
 
+  /**
+   * Creates {@link BasicFuture} and fails the request with a specified exception.
+   *
+   * @param callback request callback
+   * @param ex       specified exception
+   * @return BasicFuture created
+   */
+  private static Future<Response> failRequest(final FutureCallback<Response> callback, final Exception ex) {
+    final BasicFuture<Response> f = new BasicFuture<>(callback);
+    f.failed(ex);
+    return f;
+  }
+
+  /**
+   * Creates {@link BasicFuture} and cancels the request.
+   *
+   * @param callback request callback
+   * @return BasicFuture created
+   */
+  private static Future<Response> cancelRequest(final FutureCallback<Response> callback) {
+    final BasicFuture<Response> f = new BasicFuture<>(callback);
+    f.cancel(true);
+    return f;
+  }
+
   /**
    * Create an instance of AsyncFetcher with default options.
    *
@@ -467,7 +467,7 @@ public static final class Builder {
     /**
      * The file manager used to store raw responses.
      */
-    private FileManager fileManager;
+    private FileManager<?> fileManager;
 
     /**
      * A list of headers to append to request.
@@ -623,7 +623,7 @@ public Builder disableCookies() {
      * @param fileManager file manager to be used.
      * @return this
      */
-    public Builder setFileManager(final FileManager fileManager) {
+    public Builder setFileManager(final FileManager<?> fileManager) {
       this.fileManager = fileManager;
       return this;
     }

src/main/java/ai/preferred/venom/fetcher/StorageFetcher.java

@@ -56,7 +56,7 @@ public final class StorageFetcher implements Fetcher {
   /**
    * The file manager used to store raw responses.
    */
-  private final FileManager fileManager;
+  private final FileManager<?> fileManager;
 
   /**
    * The validator used.
@@ -85,7 +85,7 @@ private StorageFetcher(final Builder builder) {
    * @param fileManager the file manager to use.
    * @return A new instance of builder
    */
-  public static Builder builder(final FileManager fileManager) {
+  public static Builder builder(final FileManager<?> fileManager) {
     return new Builder(fileManager);
   }
 
@@ -136,7 +136,7 @@ public void cancelled() {
     });
 
     try {
-      final Record record = fileManager.get(storageFetcherRequest);
+      final Record<?> record = fileManager.get(storageFetcherRequest);
       if (record == null) {
         future.cancel();
         LOGGER.info("No content found from storage for: {}", request.getUrl());
@@ -185,7 +185,7 @@ public static final class Builder {
     /**
      * The file manager used to store raw responses.
      */
-    private final FileManager fileManager;
+    private final FileManager<?> fileManager;
 
     /**
      * A list of headers to append to request.
@@ -202,7 +202,7 @@ public static final class Builder {
      *
      * @param fileManager an instance file manager used to store raw responses.
      */
-    private Builder(final FileManager fileManager) {
+    private Builder(final FileManager<?> fileManager) {
       this.fileManager = fileManager;
       headers = Collections.emptyMap();
       validator = new PipelineValidator(

src/main/java/ai/preferred/venom/request/VRequest.java

@@ -118,8 +118,8 @@ private VRequest(final Method method, final String url, final Map<String, String
    * @param url    Request url
    * @return A new instance of builder
    */
-  public static Builder build(final Method method, final String url) {
-    return new Builder(method, url);
+  public static Builder<?> build(final Method method, final String url) {
+    return new Builder<>(method, url);
   }
 
   @Override
@@ -201,8 +201,8 @@ protected Builder(final Method method, final String url) {
      * @param url url to fetch.
      * @return an instance of builder.
      */
-    public static Builder get(final String url) {
-      return new Builder(Method.GET, url);
+    public static Builder<?> get(final String url) {
+      return new Builder<>(Method.GET, url);
     }
 
     /**
@@ -211,8 +211,8 @@ public static Builder get(final String url) {
      * @param url url to fetch.
      * @return an instance of builder.
      */
-    public static Builder post(final String url) {
-      return new Builder(Method.POST, url);
+    public static Builder<?> post(final String url) {
+      return new Builder<>(Method.POST, url);
     }
 
     /**
@@ -221,8 +221,8 @@ public static Builder post(final String url) {
      * @param url url to fetch.
      * @return an instance of builder.
      */
-    public static Builder head(final String url) {
-      return new Builder(Method.HEAD, url);
+    public static Builder<?> head(final String url) {
+      return new Builder<>(Method.HEAD, url);
     }
 
     /**
@@ -231,8 +231,8 @@ public static Builder head(final String url) {
      * @param url url to fetch.
      * @return an instance of builder.
      */
-    public static Builder put(final String url) {
-      return new Builder(Method.PUT, url);
+    public static Builder<?> put(final String url) {
+      return new Builder<>(Method.PUT, url);
     }
 
     /**
@@ -241,8 +241,8 @@ public static Builder put(final String url) {
      * @param url url to fetch.
      * @return an instance of builder.
      */
-    public static Builder delete(final String url) {
-      return new Builder(Method.DELETE, url);
+    public static Builder<?> delete(final String url) {
+      return new Builder<>(Method.DELETE, url);
     }
 
     /**
@@ -251,8 +251,8 @@ public static Builder delete(final String url) {
      * @param url url to fetch.
      * @return an instance of builder.
      */
-    public static Builder options(final String url) {
-      return new Builder(Method.OPTIONS, url);
+    public static Builder<?> options(final String url) {
+      return new Builder<>(Method.OPTIONS, url);
     }
 
     /**

src/main/java/ai/preferred/venom/response/Retrievable.java

@@ -31,5 +31,5 @@ public interface Retrievable extends Response {
    *
    * @return record where an archive has been saved
    */
-  Record getRecord();
+  Record<?> getRecord();
 }

src/main/java/ai/preferred/venom/response/StorageResponse.java

@@ -30,7 +30,7 @@ public class StorageResponse implements Response, Retrievable {
   /**
    * The record holding this response.
    */
-  private final Record record;
+  private final Record<?> record;
 
   /**
    * The base url of this response.
@@ -43,7 +43,7 @@ public class StorageResponse implements Response, Retrievable {
    * @param record  record holding this response
    * @param baseUrl base URL of the response
    */
-  public StorageResponse(final Record record, final String baseUrl) {
+  public StorageResponse(final Record<?> record, final String baseUrl) {
     this.record = record;
     this.baseUrl = baseUrl;
   }
@@ -79,7 +79,7 @@ public final HttpHost getProxy() {
   }
 
   @Override
-  public final Record getRecord() {
+  public final Record<?> getRecord() {
     return record;
   }
 }

src/main/java/ai/preferred/venom/storage/DummyFileManager.java

@@ -38,7 +38,7 @@
  * @author Maksim Tkachenko
  * @author Ween Jiann Lee
  */
-public class DummyFileManager implements FileManager {
+public class DummyFileManager implements FileManager<Object> {
 
   /**
    * Logger.
@@ -129,12 +129,12 @@ public final String put(final Request request, final Response response) throws S
   }
 
   @Override
-  public final Record get(final Object i) {
+  public final Record<Object> get(final Object i) {
     throw new UnsupportedOperationException("File not found");
   }
 
   @Override
-  public final Record get(final Request request) {
+  public final Record<Object> get(final Request request) {
     throw new UnsupportedOperationException("File not found");
   }
 

src/main/java/ai/preferred/venom/storage/FileManager.java

@@ -64,7 +64,7 @@ public interface FileManager<T> extends AutoCloseable {
    * @throws StorageException throws StorageException
    */
   @Nullable
-  Record get(T id) throws StorageException;
+  Record<T> get(T id) throws StorageException;
 
   /**
    * Returns latest record matching request.
@@ -74,6 +74,6 @@ public interface FileManager<T> extends AutoCloseable {
    * @throws StorageException throws StorageException
    */
   @NotNull
-  Record get(@NotNull Request request) throws StorageException;
+  Record<T> get(@NotNull Request request) throws StorageException;
 
 }

src/main/java/ai/preferred/venom/storage/FileManagerCallback.java

@@ -37,14 +37,14 @@ public class FileManagerCallback implements Callback {
   /**
    * The file manager used to store raw responses.
    */
-  private final FileManager fileManager;
+  private final FileManager<?> fileManager;
 
   /**
    * Constructs an instance of file manager callback.
    *
    * @param fileManager an instance of file manager used to store raw responses
    */
-  public FileManagerCallback(final FileManager fileManager) {
+  public FileManagerCallback(final FileManager<?> fileManager) {
     this.fileManager = fileManager;
   }