Commit aa03c8b1 authored by Shikhar Bhushan's avatar Shikhar Bhushan Committed by GitHub
Browse files

Merge pull request #42 from confluentinc/3.1.x 

3.1.x to master
parents 0b590cdd 040a0606

src/main/java/io/confluent/connect/elasticsearch/ElasticsearchWriter.java

+2 −1
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ public class ElasticsearchWriter { 


  public void write(Collection<SinkRecord> records) {

    for (SinkRecord sinkRecord : records) {

      final String index = sinkRecord.topic();

      final String indexOverride = topicToIndexMap.get(sinkRecord.topic());

      final String index = indexOverride != null ? indexOverride : sinkRecord.topic();

      final boolean ignoreKey = ignoreKeyTopics.contains(sinkRecord.topic()) || this.ignoreKey;

      final boolean ignoreSchema = ignoreSchemaTopics.contains(sinkRecord.topic()) || this.ignoreSchema;

src/test/java/io/confluent/connect/elasticsearch/ElasticsearchSinkTestBase.java

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public class ElasticsearchSinkTestBase extends ESIntegTestCase { 
  }



  protected void verifySearchResults(Collection<SinkRecord> records, String index, boolean ignoreKey, boolean ignoreSchema) throws IOException {

    final SearchResult result = client.execute(new Search.Builder("").build());

    final SearchResult result = client.execute(new Search.Builder("").addIndex(index).build());



    final JsonArray rawHits = result.getJsonObject().getAsJsonObject("hits").getAsJsonArray("hits");