honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove remaining xlints from plugins

This commit is contained in:
Nik Everett 2016-01-18 22:31:08 -05:00
parent 8bf8ca6222
commit 4efa8c4ff5
4 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/discovery-gce/build.gradle
View File

@ -25,8 +25,6 @@ dependencyLicenses {
mapping from: /google-.*/, to: 'google' mapping from: /google-.*/, to: 'google'
} }
compileJava.options.compilerArgs << '-Xlint:-rawtypes,-unchecked'
test { test {
// this is needed for insecure plugins, remove if possible! // this is needed for insecure plugins, remove if possible!
systemProperty 'tests.artifact', project.name systemProperty 'tests.artifact', project.name

2
plugins/discovery-gce/src/main/java/org/elasticsearch/plugin/discovery/gce/GceDiscoveryPlugin.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.plugin.discovery.gce;
import com.google.api.client.http.HttpHeaders; import com.google.api.client.http.HttpHeaders;
import com.google.api.client.util.ClassInfo; import com.google.api.client.util.ClassInfo;
import org.elasticsearch.SpecialPermission; import org.elasticsearch.SpecialPermission;
import org.elasticsearch.cloud.gce.GceComputeService; import org.elasticsearch.cloud.gce.GceComputeService;
import org.elasticsearch.cloud.gce.GceModule; import org.elasticsearch.cloud.gce.GceModule;
@ -91,6 +92,7 @@ public class GceDiscoveryPlugin extends Plugin {
} }
@Override @Override
@SuppressWarnings("rawtypes") // Supertype uses raw type
public Collection<Class<? extends LifecycleComponent>> nodeServices() { public Collection<Class<? extends LifecycleComponent>> nodeServices() {
Collection<Class<? extends LifecycleComponent>> services = new ArrayList<>(); Collection<Class<? extends LifecycleComponent>> services = new ArrayList<>();
if (isDiscoveryAlive(settings, logger)) { if (isDiscoveryAlive(settings, logger)) {

2
plugins/mapper-attachments/build.gradle
View File

@ -61,8 +61,6 @@ dependencies {
compile 'org.apache.commons:commons-compress:1.10' compile 'org.apache.commons:commons-compress:1.10'
} }
compileJava.options.compilerArgs << '-Xlint:-cast,-rawtypes'
forbiddenPatterns { forbiddenPatterns {
exclude '**/*.docx' exclude '**/*.docx'
exclude '**/*.pdf' exclude '**/*.pdf'

44
plugins/mapper-attachments/src/main/java/org/elasticsearch/mapper/attachments/AttachmentMapper.java
View File

@ -124,23 +124,23 @@ public class AttachmentMapper extends FieldMapper {
private Boolean langDetect = null; private Boolean langDetect = null;
private Mapper.Builder contentBuilder; private Mapper.Builder<?, ?> contentBuilder;
private Mapper.Builder titleBuilder = stringField(FieldNames.TITLE); private Mapper.Builder<?, ?> titleBuilder = stringField(FieldNames.TITLE);
private Mapper.Builder nameBuilder = stringField(FieldNames.NAME); private Mapper.Builder<?, ?> nameBuilder = stringField(FieldNames.NAME);
private Mapper.Builder authorBuilder = stringField(FieldNames.AUTHOR); private Mapper.Builder<?, ?> authorBuilder = stringField(FieldNames.AUTHOR);
private Mapper.Builder keywordsBuilder = stringField(FieldNames.KEYWORDS); private Mapper.Builder<?, ?> keywordsBuilder = stringField(FieldNames.KEYWORDS);
private Mapper.Builder dateBuilder = dateField(FieldNames.DATE); private Mapper.Builder<?, ?> dateBuilder = dateField(FieldNames.DATE);
private Mapper.Builder contentTypeBuilder = stringField(FieldNames.CONTENT_TYPE); private Mapper.Builder<?, ?> contentTypeBuilder = stringField(FieldNames.CONTENT_TYPE);
private Mapper.Builder contentLengthBuilder = integerField(FieldNames.CONTENT_LENGTH); private Mapper.Builder<?, ?> contentLengthBuilder = integerField(FieldNames.CONTENT_LENGTH);
private Mapper.Builder languageBuilder = stringField(FieldNames.LANGUAGE); private Mapper.Builder<?, ?> languageBuilder = stringField(FieldNames.LANGUAGE);
public Builder(String name) { public Builder(String name) {
super(name, new AttachmentFieldType(), new AttachmentFieldType()); super(name, new AttachmentFieldType(), new AttachmentFieldType());
@ -148,47 +148,47 @@ public class AttachmentMapper extends FieldMapper {
this.contentBuilder = stringField(FieldNames.CONTENT); this.contentBuilder = stringField(FieldNames.CONTENT);
} }
public Builder content(Mapper.Builder content) { public Builder content(Mapper.Builder<?, ?> content) {
this.contentBuilder = content; this.contentBuilder = content;
return this; return this;
} }
public Builder date(Mapper.Builder date) { public Builder date(Mapper.Builder<?, ?> date) {
this.dateBuilder = date; this.dateBuilder = date;
return this; return this;
} }
public Builder author(Mapper.Builder author) { public Builder author(Mapper.Builder<?, ?> author) {
this.authorBuilder = author; this.authorBuilder = author;
return this; return this;
} }
public Builder title(Mapper.Builder title) { public Builder title(Mapper.Builder<?, ?> title) {
this.titleBuilder = title; this.titleBuilder = title;
return this; return this;
} }
public Builder name(Mapper.Builder name) { public Builder name(Mapper.Builder<?, ?> name) {
this.nameBuilder = name; this.nameBuilder = name;
return this; return this;
} }
public Builder keywords(Mapper.Builder keywords) { public Builder keywords(Mapper.Builder<?, ?> keywords) {
this.keywordsBuilder = keywords; this.keywordsBuilder = keywords;
return this; return this;
} }
public Builder contentType(Mapper.Builder contentType) { public Builder contentType(Mapper.Builder<?, ?> contentType) {
this.contentTypeBuilder = contentType; this.contentTypeBuilder = contentType;
return this; return this;
} }
public Builder contentLength(Mapper.Builder contentType) { public Builder contentLength(Mapper.Builder<?, ?> contentType) {
this.contentLengthBuilder = contentType; this.contentLengthBuilder = contentType;
return this; return this;
} }
public Builder language(Mapper.Builder language) { public Builder language(Mapper.Builder<?, ?> language) {
this.languageBuilder = language; this.languageBuilder = language;
return this; return this;
} }
@ -202,7 +202,7 @@ public class AttachmentMapper extends FieldMapper {
if (contentBuilder instanceof FieldMapper.Builder == false) { if (contentBuilder instanceof FieldMapper.Builder == false) {
throw new IllegalStateException("content field for attachment must be a field mapper"); throw new IllegalStateException("content field for attachment must be a field mapper");
} }
((FieldMapper.Builder)contentBuilder).indexName(name); ((FieldMapper.Builder<?, ?>)contentBuilder).indexName(name);
contentBuilder.name = name + "." + FieldNames.CONTENT; contentBuilder.name = name + "." + FieldNames.CONTENT;
contentMapper = (FieldMapper) contentBuilder.build(context); contentMapper = (FieldMapper) contentBuilder.build(context);
context.path().add(name); context.path().add(name);
@ -299,9 +299,9 @@ public class AttachmentMapper extends FieldMapper {
return mapperBuilder; return mapperBuilder;
} }
@SuppressWarnings({"unchecked"})
@Override @Override
public Mapper.Builder parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException { @SuppressWarnings("unchecked") // Safe because we know how our maps are shaped
public Mapper.Builder<?, ?> parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException {
AttachmentMapper.Builder builder = new AttachmentMapper.Builder(name); AttachmentMapper.Builder builder = new AttachmentMapper.Builder(name);
for (Iterator<Map.Entry<String, Object>> iterator = node.entrySet().iterator(); iterator.hasNext();) { for (Iterator<Map.Entry<String, Object>> iterator = node.entrySet().iterator(); iterator.hasNext();) {
@ -316,7 +316,7 @@ public class AttachmentMapper extends FieldMapper {
Map<String, Object> propNode = (Map<String, Object>) entry1.getValue(); Map<String, Object> propNode = (Map<String, Object>) entry1.getValue();
Mapper.Builder<?, ?> mapperBuilder = findMapperBuilder(propNode, propName, parserContext); Mapper.Builder<?, ?> mapperBuilder = findMapperBuilder(propNode, propName, parserContext);
if (parseMultiField((FieldMapper.Builder) mapperBuilder, fieldName, parserContext, propName, propNode)) { if (parseMultiField((FieldMapper.Builder<?, ?>) mapperBuilder, fieldName, parserContext, propName, propNode)) {
fieldsIterator.remove(); fieldsIterator.remove();
} else if (propName.equals(name) && parserContext.indexVersionCreated().before(Version.V_2_0_0_beta1)) { } else if (propName.equals(name) && parserContext.indexVersionCreated().before(Version.V_2_0_0_beta1)) {
builder.content(mapperBuilder); builder.content(mapperBuilder);