Skip to content

Commit

Permalink
Remove -Xlint exclusions in all plugins. (#40721)
Browse files Browse the repository at this point in the history
The xlint exclusions of the following plugins were removed:
* ingest-attachment.
* mapper-size.
* transport-nio. Removing the -try exclusion required some work, because
  the NettyAdaptor implements AutoCloseable and NettyAdaptor#close() method
  could throw an InterruptedException (ChannelFuture#await() and a generic
  Exception is re-thrown, which maybe an ChannelFuture). The easiest way
  around this to me seemed that NettyAdaptor should not implement AutoCloseable,
  because it is not directly used in a try-with-resources statement.

Relates to #40366
  • Loading branch information
martijnvg authored Apr 4, 2019
1 parent 153c1eb commit f3650b4
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 13 deletions.
4 changes: 0 additions & 4 deletions plugins/ingest-attachment/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,6 @@ dependencies {
compile "org.apache.james:apache-mime4j-dom:${versions.mime4j}"
}

// TODO: stop using LanguageIdentifier...
compileJava.options.compilerArgs << "-Xlint:-deprecation"


dependencyLicenses {
mapping from: /apache-mime4j-.*/, to: 'apache-mime4j'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ public IngestDocument execute(IngestDocument ingestDocument) {
}

if (properties.contains(Property.LANGUAGE) && Strings.hasLength(parsedContent)) {
// TODO: stop using LanguageIdentifier...
LanguageIdentifier identifier = new LanguageIdentifier(parsedContent);
String language = identifier.getLanguage();
additionalFields.put(Property.LANGUAGE.toLowerCase(), language);
Expand Down
4 changes: 0 additions & 4 deletions plugins/mapper-size/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,3 @@ esplugin {
description 'The Mapper Size plugin allows document to record their uncompressed size at index time.'
classname 'org.elasticsearch.plugin.mapper.MapperSizePlugin'
}

// TODO: migrate to points
compileJava.options.compilerArgs << "-Xlint:-deprecation"
compileTestJava.options.compilerArgs << "-Xlint:-deprecation"
3 changes: 0 additions & 3 deletions plugins/transport-nio/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ esplugin {
hasClientJar = true
}

compileJava.options.compilerArgs << "-Xlint:-try"
compileTestJava.options.compilerArgs << "-Xlint:-rawtypes,-unchecked"

dependencies {
compile "org.elasticsearch:elasticsearch-nio:${version}"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import java.util.LinkedList;
import java.util.function.BiConsumer;

public class NettyAdaptor implements AutoCloseable {
class NettyAdaptor {

private final EmbeddedChannel nettyChannel;
private final LinkedList<FlushOperation> flushOperations = new LinkedList<>();
Expand Down Expand Up @@ -64,7 +64,6 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
nettyChannel.pipeline().addLast(handlers);
}

@Override
public void close() throws Exception {
assert flushOperations.isEmpty() : "Should close outbound operations before calling close";

Expand Down

0 comments on commit f3650b4

Please sign in to comment.