github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-25 07:07:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

MINOR: Fix compiler warnings from general Class type use

Browse source 
Fixes #7705
This commit is contained in:
Armin 2017-07-16 14:41:04 +02:00 • committed by Armin Braun
parent ca1962f697
commit 0e1a95e7cf
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java
View file

@ -65,7 +65,7 @@ public class Queue implements Closeable {
private final AtomicBoolean closed; private final AtomicBoolean closed;
// deserialization // deserialization
private final Class elementClass; private final Class<? extends Queueable> elementClass;
private final Method deserializeMethod; private final Method deserializeMethod;
// thread safety // 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.dirPath = dirPath;
this.pageCapacity = pageCapacity; this.pageCapacity = pageCapacity;
this.maxBytes = maxBytes; this.maxBytes = maxBytes;

4
logstash-core/src/main/java/org/logstash/ackedqueue/Settings.java
View file

@ -9,7 +9,7 @@ public interface Settings {
PageIOFactory getPageIOFactory(); PageIOFactory getPageIOFactory();
Class getElementClass(); Class<? extends Queueable> getElementClass();
String getDirPath(); String getDirPath();
@ -29,7 +29,7 @@ public interface Settings {
Builder elementIOFactory(PageIOFactory factory); Builder elementIOFactory(PageIOFactory factory);
Builder elementClass(Class elementClass); Builder elementClass(Class<? extends Queueable> elementClass);
Builder capacity(int capacity); Builder capacity(int capacity);

26
logstash-core/src/main/java/org/logstash/ackedqueue/SettingsImpl.java
View file

@ -7,7 +7,7 @@ public class SettingsImpl implements Settings {
private String dirForFiles; private String dirForFiles;
private CheckpointIOFactory checkpointIOFactory; private CheckpointIOFactory checkpointIOFactory;
private PageIOFactory pageIOFactory; private PageIOFactory pageIOFactory;
private Class elementClass; private Class<? extends Queueable> elementClass;
private int capacity; private int capacity;
private long queueMaxBytes; private long queueMaxBytes;
private int maxUnread; private int maxUnread;
@ -36,11 +36,10 @@ public class SettingsImpl implements Settings {
.checkpointMaxWrites(1); .checkpointMaxWrites(1);
} }
private SettingsImpl(final String dirForFiles, private SettingsImpl(final String dirForFiles, final CheckpointIOFactory checkpointIOFactory,
final CheckpointIOFactory checkpointIOFactory, final PageIOFactory pageIOFactory, final Class<? extends Queueable> elementClass,
final PageIOFactory pageIOFactory, final Class elementClass, final int capacity, final int capacity, final long queueMaxBytes, final int maxUnread,
final long queueMaxBytes, final int maxUnread, final int checkpointMaxAcks, final int checkpointMaxAcks, final int checkpointMaxWrites) {
final int checkpointMaxWrites) {
this.dirForFiles = dirForFiles; this.dirForFiles = dirForFiles;
this.checkpointIOFactory = checkpointIOFactory; this.checkpointIOFactory = checkpointIOFactory;
this.pageIOFactory = pageIOFactory; this.pageIOFactory = pageIOFactory;
@ -72,7 +71,7 @@ public class SettingsImpl implements Settings {
} }
@Override @Override
public Class getElementClass() { public Class<? extends Queueable> getElementClass() {
return this.elementClass; return this.elementClass;
} }
@ -132,7 +131,7 @@ public class SettingsImpl implements Settings {
private final PageIOFactory pageIOFactory; private final PageIOFactory pageIOFactory;
private final Class elementClass; private final Class<? extends Queueable> elementClass;
private final int capacity; private final int capacity;
@ -150,11 +149,10 @@ public class SettingsImpl implements Settings {
); );
} }
private BuilderImpl(final String dirForFiles, private BuilderImpl(final String dirForFiles, final CheckpointIOFactory checkpointIOFactory,
final CheckpointIOFactory checkpointIOFactory, final PageIOFactory pageIOFactory, final Class<? extends Queueable> elementClass,
final PageIOFactory pageIOFactory, final Class elementClass, final int capacity, final int capacity, final long queueMaxBytes, final int maxUnread,
final long queueMaxBytes, final int maxUnread, final int checkpointMaxAcks, final int checkpointMaxAcks, final int checkpointMaxWrites) {
final int checkpointMaxWrites) {
this.dirForFiles = dirForFiles; this.dirForFiles = dirForFiles;
this.checkpointIOFactory = checkpointIOFactory; this.checkpointIOFactory = checkpointIOFactory;
this.pageIOFactory = pageIOFactory; this.pageIOFactory = pageIOFactory;
@ -186,7 +184,7 @@ public class SettingsImpl implements Settings {
} }
@Override @Override
public Builder elementClass(final Class elementClass) { public Builder elementClass(final Class<? extends Queueable> elementClass) {
return new BuilderImpl( return new BuilderImpl(
this.dirForFiles, this.checkpointIOFactory, this.pageIOFactory, elementClass, this.dirForFiles, this.checkpointIOFactory, this.pageIOFactory, elementClass,
this.capacity, this.capacity,