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

use ActionListener.wrap(...) helper rather than anonymous action listener implementations 

Original commit: elastic/x-pack-elasticsearch@d3c7e176ef
This commit is contained in:
Martijn van Groningen 2017-01-09 13:44:03 +01:00
parent ade3f6f207
commit c06342b556
1 changed files with 8 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/persistence/JobProvider.java
View File

@ -11,11 +11,8 @@ import org.apache.lucene.util.BytesRefIterator;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.ResourceNotFoundException;
import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetRequest;
import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.action.search.MultiSearchRequest; import org.elasticsearch.action.search.MultiSearchRequest;
@ -140,18 +137,7 @@ public class JobProvider {
client.admin().indices().prepareCreate(PRELERT_USAGE_INDEX) client.admin().indices().prepareCreate(PRELERT_USAGE_INDEX)
.setSettings(mlResultsIndexSettings()) .setSettings(mlResultsIndexSettings())
.addMapping(Usage.TYPE, usageMapping) .addMapping(Usage.TYPE, usageMapping)
.execute(new ActionListener<CreateIndexResponse>() { .execute(ActionListener.wrap(r -> listener.accept(true, null), e -> listener.accept(false, e)));
@Override
public void onResponse(CreateIndexResponse createIndexResponse) {
listener.accept(true, null);
}
@Override
public void onFailure(Exception e) {
listener.accept(false, e);
}
});
} catch (Exception e) { } catch (Exception e) {
LOGGER.warn("Error creating the usage metering index", e); LOGGER.warn("Error creating the usage metering index", e);
} }
@ -244,34 +230,14 @@ public class JobProvider {
listener = ActionListener.wrap(aBoolean -> { listener = ActionListener.wrap(aBoolean -> {
client.admin().indices().prepareAliases() client.admin().indices().prepareAliases()
.addAlias(indexName, AnomalyDetectorsIndex.jobResultsIndexName(jobId)) .addAlias(indexName, AnomalyDetectorsIndex.jobResultsIndexName(jobId))
.execute(new ActionListener<IndicesAliasesResponse>() { .execute(ActionListener.wrap(r -> responseListener.onResponse(true), responseListener::onFailure));
@Override
public void onResponse(IndicesAliasesResponse indicesAliasesResponse) {
responseListener.onResponse(true);
}
@Override
public void onFailure(Exception e) {
responseListener.onFailure(e);
}
});
}, },
listener::onFailure); listener::onFailure);
} }
final ActionListener<Boolean> createdListener = listener; final ActionListener<Boolean> createdListener = listener;
client.admin().indices().create(createIndexRequest, new ActionListener<CreateIndexResponse>() { client.admin().indices().create(createIndexRequest,
@Override ActionListener.wrap(r -> createdListener.onResponse(true), createdListener::onFailure));
public void onResponse(CreateIndexResponse createIndexResponse) {
createdListener.onResponse(true);
}
@Override
public void onFailure(Exception e) {
createdListener.onFailure(e);
}
});
} catch (Exception e) { } catch (Exception e) {
listener.onFailure(e); listener.onFailure(e);
} }
@ -290,17 +256,8 @@ public class JobProvider {
createIndexRequest.mapping(Quantiles.TYPE.getPreferredName(), quantilesMapping); createIndexRequest.mapping(Quantiles.TYPE.getPreferredName(), quantilesMapping);
createIndexRequest.mapping(ModelState.TYPE.getPreferredName(), modelStateMapping); createIndexRequest.mapping(ModelState.TYPE.getPreferredName(), modelStateMapping);
client.admin().indices().create(createIndexRequest, new ActionListener<CreateIndexResponse>() { client.admin().indices().create(createIndexRequest,
@Override ActionListener.wrap(r -> listener.accept(true, null), e -> listener.accept(false, e)));
public void onResponse(CreateIndexResponse createIndexResponse) {
listener.accept(true, null);
}
@Override
public void onFailure(Exception e) {
listener.accept(false, e);
}
});
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("Error creating the " + AnomalyDetectorsIndex.jobStateIndexName() + " index", e); LOGGER.error("Error creating the " + AnomalyDetectorsIndex.jobStateIndexName() + " index", e);
} }
@ -317,17 +274,8 @@ public class JobProvider {
try { try {
DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(indexName); DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(indexName);
client.admin().indices().delete(deleteIndexRequest, new ActionListener<DeleteIndexResponse>() { client.admin().indices().delete(deleteIndexRequest,
@Override ActionListener.wrap(r -> listener.onResponse(new DeleteJobAction.Response(r.isAcknowledged())), listener::onFailure));
public void onResponse(DeleteIndexResponse deleteIndexResponse) {
listener.onResponse(new DeleteJobAction.Response(deleteIndexResponse.isAcknowledged()));
}
@Override
public void onFailure(Exception e) {
listener.onFailure(e);
}
});
} catch (Exception e) { } catch (Exception e) {
listener.onFailure(e); listener.onFailure(e);
} }