Commit abf31091 authored by Robert Yokota's avatar Robert Yokota
Browse files

Merge remote-tracking branch 'upstream/master'

parents e3658781 281e6602

pom.xml

+6 −0
Original line number Diff line number Diff line
@@ -189,6 +189,12 @@ 
                <groupId>org.apache.maven.plugins</groupId>

                <artifactId>maven-compiler-plugin</artifactId>

                <inherited>true</inherited>

                <configuration>

                    <compilerArgs>

                        <arg>-Xlint:all</arg>

                        <arg>-Werror</arg>

                    </compilerArgs>

                </configuration>

            </plugin>

            <plugin>

                <groupId>org.apache.maven.plugins</groupId>

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

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ public class ElasticsearchSinkTask extends SinkTask { 
    start(props, null);

  }



  @SuppressWarnings("deprecation")

  // public for testing

  public void start(Map<String, String> props, ElasticsearchClient client) {

    try {

src/main/java/io/confluent/connect/elasticsearch/jest/JestElasticsearchClient.java

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ public class JestElasticsearchClient implements ElasticsearchClient { 
  }



  private boolean indexExists(String index) {

    Action action = new IndicesExists.Builder(index).build();

    Action<JestResult> action = new IndicesExists.Builder(index).build();

    try {

      JestResult result = client.execute(action);

      return result.isSucceeded();

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

+2 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class DataConverterTest { 
                .put(ElasticsearchSinkConnectorConstants.MAP_KEY, 2)

                .put(ElasticsearchSinkConnectorConstants.MAP_VALUE, 0.42)

        )),

        new HashSet<>((List) converter.preProcessValue(origValue, origSchema, preProcessedSchema))

        new HashSet<>((List<?>) converter.preProcessValue(origValue, origSchema, preProcessedSchema))

    );



    // optional
@@ -216,7 +216,7 @@ public class DataConverterTest { 
                        .put(ElasticsearchSinkConnectorConstants.MAP_KEY, "field2")

                        .put(ElasticsearchSinkConnectorConstants.MAP_VALUE, 2)

        )),

        new HashSet<>((List) converter.preProcessValue(origValue, origSchema, preProcessedSchema))

        new HashSet<>((List<?>) converter.preProcessValue(origValue, origSchema, preProcessedSchema))

    );

  }