refactoring getter/setters for package action.admin.cluster.reroute #2657

Author: dadoonet

src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java

@@ -40,10 +40,6 @@ public class ClusterRerouteResponse extends ActionResponse {
         this.state = state;
     }
 
-    public ClusterState state() {
-        return this.state;
-    }
-
     public ClusterState getState() {
         return this.state;
     }

src/main/java/org/elasticsearch/rest/action/admin/cluster/reroute/RestClusterRerouteAction.java

@@ -77,7 +77,7 @@ public void onResponse(ClusterRerouteResponse response) {
                     if (request.param("filter_metadata") == null) {
                         request.params().put("filter_metadata", "true");
                     }
-                    response.state().settingsFilter(settingsFilter).toXContent(builder, request);
+                    response.getState().settingsFilter(settingsFilter).toXContent(builder, request);
                     builder.endObject();
 
                     builder.endObject();

src/test/java/org/elasticsearch/test/integration/cluster/allocation/ClusterRerouteTests.java

@@ -79,7 +79,7 @@ public void rerouteWithCommands() throws Exception {
         state = client("node1").admin().cluster().prepareReroute()
                 .add(new AllocateAllocationCommand(new ShardId("test", 0), "node1", true))
                 .setDryRun(true)
-                .execute().actionGet().state();
+                .execute().actionGet().getState();
         assertThat(state.routingNodes().unassigned().size(), equalTo(1));
         assertThat(state.routingNodes().node(state.nodes().resolveNode("node1").id()).shards().get(0).state(), equalTo(ShardRoutingState.INITIALIZING));
 
@@ -90,7 +90,7 @@ public void rerouteWithCommands() throws Exception {
         logger.info("--> explicitly allocate shard 1, actually allocating, no dry run");
         state = client("node1").admin().cluster().prepareReroute()
                 .add(new AllocateAllocationCommand(new ShardId("test", 0), "node1", true))
-                .execute().actionGet().state();
+                .execute().actionGet().getState();
         assertThat(state.routingNodes().unassigned().size(), equalTo(1));
         assertThat(state.routingNodes().node(state.nodes().resolveNode("node1").id()).shards().get(0).state(), equalTo(ShardRoutingState.INITIALIZING));
 
@@ -105,7 +105,7 @@ public void rerouteWithCommands() throws Exception {
         logger.info("--> move shard 1 primary from node1 to node2");
         state = client("node1").admin().cluster().prepareReroute()
                 .add(new MoveAllocationCommand(new ShardId("test", 0), "node1", "node2"))
-                .execute().actionGet().state();
+                .execute().actionGet().getState();
 
         assertThat(state.routingNodes().node(state.nodes().resolveNode("node1").id()).shards().get(0).state(), equalTo(ShardRoutingState.RELOCATING));
         assertThat(state.routingNodes().node(state.nodes().resolveNode("node2").id()).shards().get(0).state(), equalTo(ShardRoutingState.INITIALIZING));
@@ -149,7 +149,7 @@ public void rerouteWithAllocateLocalGateway() throws Exception {
         logger.info("--> explicitly allocate shard 1, actually allocating, no dry run");
         state = client("node1").admin().cluster().prepareReroute()
                 .add(new AllocateAllocationCommand(new ShardId("test", 0), "node1", true))
-                .execute().actionGet().state();
+                .execute().actionGet().getState();
         assertThat(state.routingNodes().unassigned().size(), equalTo(1));
         assertThat(state.routingNodes().node(state.nodes().resolveNode("node1").id()).shards().get(0).state(), equalTo(ShardRoutingState.INITIALIZING));