iter

Author: martijnvg

x-pack/plugin/ccr/build.gradle

@@ -16,6 +16,8 @@ archivesBaseName = 'x-pack-ccr'
 
 integTest.enabled = false
 
+compileJava.options.compilerArgs << "-Xlint:-try"
+
 // Instead we create a separate task to run the
 // tests based on ESIntegTestCase
 task internalClusterTest(type: RandomizedTestingTask,

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTask.java

@@ -79,7 +79,7 @@ public class ShardFollowTask implements PersistentTaskParams {
         this.maxChunkSize = maxChunkSize;
         this.numConcurrentChunks = numConcurrentChunks;
         this.processorMaxTranslogBytes = processorMaxTranslogBytes;
-        this.headers = headers != null ? headers : Collections.emptyMap();
+        this.headers = headers != null ? Collections.unmodifiableMap(headers) : Collections.emptyMap();
     }
 
     public ShardFollowTask(StreamInput in) throws IOException {
@@ -89,7 +89,7 @@ public ShardFollowTask(StreamInput in) throws IOException {
         this.maxChunkSize = in.readVLong();
         this.numConcurrentChunks = in.readVInt();
         this.processorMaxTranslogBytes = in.readVLong();
-        this.headers = in.readMap(StreamInput::readString, StreamInput::readString);
+        this.headers = Collections.unmodifiableMap(in.readMap(StreamInput::readString, StreamInput::readString));
     }
 
     public String getLeaderClusterAlias() {

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java

@@ -374,7 +374,6 @@ boolean shouldRetry(Exception e) {
 
     }
 
-    @SuppressWarnings("try")
     static Client wrapClient(Client client, ShardFollowTask shardFollowTask) {
         if (shardFollowTask.getHeaders().isEmpty()) {
             return client;

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardFollowTaskTests.java

@@ -9,7 +9,6 @@
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.test.AbstractSerializingTestCase;
-import org.elasticsearch.test.RandomObjects;
 
 import java.io.IOException;
 import java.util.Collections;

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/privilege/PrivilegeTests.java

@@ -127,4 +127,13 @@ public void testSystem() throws Exception {
         assertThat(predicate.test("indices:admin/seq_no/global_checkpoint_sync[p]"), is(true));
         assertThat(predicate.test("indices:admin/seq_no/global_checkpoint_sync[r]"), is(true));
     }
+
+    public void testManageCcrPrivilege() {
+        Predicate<String> predicate = ClusterPrivilege.MANAGE_CCR.predicate();
+        assertThat(predicate.test("cluster:admin/xpack/ccr/follow_index"), is(true));
+        assertThat(predicate.test("cluster:admin/xpack/ccr/unfollow_index"), is(true));
+        assertThat(predicate.test("cluster:admin/xpack/ccr/brand_new_api"), is(true));
+        assertThat(predicate.test("cluster:admin/xpack/whatever"), is(false));
+    }
+
 }