Merge pull request richardwilly98#580 from kdkeck/es-update-1.7.3

Update to Elasticsearch 1.7.3

Author: benmccann

pom.xml

@@ -43,7 +43,7 @@
 </parent>
 
 <properties>
-<elasticsearch.version>1.4.2</elasticsearch.version>
+<elasticsearch.version>1.7.3</elasticsearch.version>
 <mongo-java-driver.version>3.0.4</mongo-java-driver.version>
 <de.flapdoodle.embed.mongo.version>1.48.2</de.flapdoodle.embed.mongo.version>
 <hamcrest.version>1.3</hamcrest.version>

src/main/java/org/elasticsearch/river/mongodb/Indexer.java

@@ -171,7 +171,7 @@ private Timestamp<?> processBlockingQueue(QueueEntry entry) {
  }
  try {
  ExecutableScript executableScript = scriptService.executable(definition.getScriptType(), definition.getScript(),
- ScriptService.ScriptType.INLINE, ImmutableMap.of("logger", logger));
+ ScriptService.ScriptType.INLINE, ImmutableMap.<String, Object>of("logger", logger));
  executableScript.setNextVar("ctx", ctx);
  executableScript.run();
  // we need to unwrap the context object...
@@ -316,7 +316,7 @@ private Timestamp<?> applyAdvancedTransformation(QueueEntry entry, String type)
  ctx.put("documents", documents);
  try {
  ExecutableScript executableScript = scriptService.executable(definition.getScriptType(), definition.getScript(),
- ScriptService.ScriptType.INLINE, ImmutableMap.of("logger", logger));
+ ScriptService.ScriptType.INLINE, ImmutableMap.<String, Object>of("logger", logger));
  if (logger.isTraceEnabled()) {
  logger.trace("Script to be executed: {} - {}", definition.getScriptType(), definition.getScript());
  logger.trace("Context before script executed: {}", ctx);

src/main/java/org/elasticsearch/river/mongodb/MongoDBRiverDefinition.java

@@ -666,7 +666,7 @@ public synchronized static MongoDBRiverDefinition parseSettings(String riverName
  if (initalTimestampSettings.containsKey(INITIAL_TIMESTAMP_SCRIPT_FIELD)) {
 
  ExecutableScript scriptExecutable = scriptService.executable(scriptType,
- initalTimestampSettings.get(INITIAL_TIMESTAMP_SCRIPT_FIELD).toString(), ScriptService.ScriptType.INLINE, Maps.newHashMap());
+ initalTimestampSettings.get(INITIAL_TIMESTAMP_SCRIPT_FIELD).toString(), ScriptService.ScriptType.INLINE, Maps.<String, Object>newHashMap());
  Object ctx = scriptExecutable.run();
  logger.trace("initialTimestamp script returned: {}", ctx);
  if (ctx != null) {

src/test/resources/settings.yml

@@ -24,8 +24,8 @@ cluster:
 script.disable_dynamic: false
 
 plugins:
- mapper-attachments: elasticsearch/elasticsearch-mapper-attachments/2.4.1
- lang-javascript: elasticsearch/elasticsearch-lang-javascript/2.4.1
+ mapper-attachments: elasticsearch/elasticsearch-mapper-attachments/2.7.0
+ lang-javascript: elasticsearch/elasticsearch-lang-javascript/2.7.0
 
 mongodb:
  version: 3.0.0