From 0e1a95e7cf9e4f81abc309ad0924e419767bec14 Mon Sep 17 00:00:00 2001
From: Armin <me@obrown.io>
Date: Sun, 16 Jul 2017 14:41:04 +0200
Subject: [PATCH] MINOR: Fix compiler warnings from general Class type use

Fixes #7705
---
 .../java/org/logstash/ackedqueue/Queue.java   |  6 +++--
 .../org/logstash/ackedqueue/Settings.java     |  4 +--
 .../org/logstash/ackedqueue/SettingsImpl.java | 26 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java b/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java
index 19274cb1d..76284b89c 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java
@@ -65,7 +65,7 @@ public class Queue implements Closeable {
     private final AtomicBoolean closed;
 
     // deserialization
-    private final Class elementClass;
+    private final Class<? extends Queueable> elementClass;
     private final Method deserializeMethod;
 
     // thread safety
@@ -93,7 +93,9 @@ public class Queue implements Closeable {
         );
     }
 
-    private Queue(String dirPath, int pageCapacity, long maxBytes, CheckpointIO checkpointIO, PageIOFactory pageIOFactory, Class elementClass, int maxUnread, int checkpointMaxWrites, int checkpointMaxAcks) {
+    private Queue(String dirPath, int pageCapacity, long maxBytes, CheckpointIO checkpointIO,
+        PageIOFactory pageIOFactory, Class<? extends Queueable> elementClass, int maxUnread,
+        int checkpointMaxWrites, int checkpointMaxAcks) {
         this.dirPath = dirPath;
         this.pageCapacity = pageCapacity;
         this.maxBytes = maxBytes;
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/Settings.java b/logstash-core/src/main/java/org/logstash/ackedqueue/Settings.java
index 8a40aa521..09378de1b 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/Settings.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/Settings.java
@@ -9,7 +9,7 @@ public interface Settings {
 
     PageIOFactory getPageIOFactory();
 
-    Class getElementClass();
+    Class<? extends Queueable> getElementClass();
 
     String getDirPath();
 
@@ -29,7 +29,7 @@ public interface Settings {
 
         Builder elementIOFactory(PageIOFactory factory);
 
-        Builder elementClass(Class elementClass);
+        Builder elementClass(Class<? extends Queueable> elementClass);
 
         Builder capacity(int capacity);
 
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/SettingsImpl.java b/logstash-core/src/main/java/org/logstash/ackedqueue/SettingsImpl.java
index abc7b1e98..0ebcf8aad 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/SettingsImpl.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/SettingsImpl.java
@@ -7,7 +7,7 @@ public class SettingsImpl implements Settings {
     private String dirForFiles;
     private CheckpointIOFactory checkpointIOFactory;
     private PageIOFactory pageIOFactory;
-    private Class elementClass;
+    private Class<? extends Queueable> elementClass;
     private int capacity;
     private long queueMaxBytes;
     private int maxUnread;
@@ -36,11 +36,10 @@ public class SettingsImpl implements Settings {
             .checkpointMaxWrites(1);
     }
 
-    private SettingsImpl(final String dirForFiles,
-        final CheckpointIOFactory checkpointIOFactory,
-        final PageIOFactory pageIOFactory, final Class elementClass, final int capacity,
-        final long queueMaxBytes, final int maxUnread, final int checkpointMaxAcks,
-        final int checkpointMaxWrites) {
+    private SettingsImpl(final String dirForFiles, final CheckpointIOFactory checkpointIOFactory,
+        final PageIOFactory pageIOFactory, final Class<? extends Queueable> elementClass,
+        final int capacity, final long queueMaxBytes, final int maxUnread,
+        final int checkpointMaxAcks, final int checkpointMaxWrites) {
         this.dirForFiles = dirForFiles;
         this.checkpointIOFactory = checkpointIOFactory;
         this.pageIOFactory = pageIOFactory;
@@ -72,7 +71,7 @@ public class SettingsImpl implements Settings {
     }
 
     @Override
-    public Class getElementClass()  {
+    public Class<? extends Queueable> getElementClass()  {
         return this.elementClass;
     }
 
@@ -132,7 +131,7 @@ public class SettingsImpl implements Settings {
 
         private final PageIOFactory pageIOFactory;
 
-        private final Class elementClass;
+        private final Class<? extends Queueable> elementClass;
 
         private final int capacity;
 
@@ -150,11 +149,10 @@ public class SettingsImpl implements Settings {
             );
         }
 
-        private BuilderImpl(final String dirForFiles,
-            final CheckpointIOFactory checkpointIOFactory,
-            final PageIOFactory pageIOFactory, final Class elementClass, final int capacity,
-            final long queueMaxBytes, final int maxUnread, final int checkpointMaxAcks,
-            final int checkpointMaxWrites) {
+        private BuilderImpl(final String dirForFiles, final CheckpointIOFactory checkpointIOFactory,
+            final PageIOFactory pageIOFactory, final Class<? extends Queueable> elementClass,
+            final int capacity, final long queueMaxBytes, final int maxUnread,
+            final int checkpointMaxAcks, final int checkpointMaxWrites) {
             this.dirForFiles = dirForFiles;
             this.checkpointIOFactory = checkpointIOFactory;
             this.pageIOFactory = pageIOFactory;
@@ -186,7 +184,7 @@ public class SettingsImpl implements Settings {
         }
 
         @Override
-        public Builder elementClass(final Class elementClass) {
+        public Builder elementClass(final Class<? extends Queueable> elementClass) {
             return new BuilderImpl(
                 this.dirForFiles, this.checkpointIOFactory, this.pageIOFactory, elementClass,
                 this.capacity,