Merge bug24527 in to get clean compile.

Author: Steve Powell

test/src/com/rabbitmq/examples/perf/BrokerValue.java

@@ -25,22 +25,18 @@ public BrokerValue(Broker broker) {
         this.broker = broker;
     }
 
-    @Override
     public void setup(MulticastParams params) throws IOException {
         broker.start();
     }
 
-    @Override
     public void teardown(MulticastParams params) {
         broker.stop();
     }
 
-    @Override
     public String getName() {
         return "broker_type";
     }
 
-    @Override
     public String getValue() {
         return broker.getName();
     }

test/src/com/rabbitmq/examples/perf/BrokerVariable.java

@@ -26,7 +26,6 @@ public BrokerVariable(Broker... brokers) {
         this.brokers = brokers;
     }
 
-    @Override
     public List<BrokerValue> getValues() {
         List<BrokerValue> values = new ArrayList<BrokerValue>();
         for (Broker b : brokers) {

test/src/com/rabbitmq/examples/perf/MulticastValue.java

@@ -25,21 +25,17 @@ class MulticastValue implements VariableValue {
         this.value = value;
     }
 
-    @Override
     public void setup(MulticastParams params) {
         PerfUtil.setValue(params, name, value);
     }
 
-    @Override
     public void teardown(MulticastParams params) {
     }
 
-    @Override
     public String getName() {
         return name;
     }
 
-    @Override
     public Object getValue() {
         return value;
     }

test/src/com/rabbitmq/examples/perf/RateVsLatencyScenario.java

@@ -18,8 +18,6 @@
 
 import com.rabbitmq.client.ConnectionFactory;
 
-import java.io.IOException;
-
 public class RateVsLatencyScenario implements Scenario {
     private String name;
     private ConnectionFactory factory;
@@ -32,7 +30,6 @@ public RateVsLatencyScenario(String name, ConnectionFactory factory, MulticastPa
         this.params = params;
     }
 
-    @Override
     public void run() throws Exception {
         SimpleScenario s = new SimpleScenario("untitled", factory, params);
         s.run();
@@ -48,12 +45,10 @@ public void run() throws Exception {
         impl.run();
     }
 
-    @Override
     public ScenarioStats getStats() {
         return impl.getStats();
     }
 
-    @Override
     public String getName() {
         return name;
     }

test/src/com/rabbitmq/examples/perf/SimpleScenario.java

@@ -38,7 +38,6 @@ public SimpleScenario(String name, ConnectionFactory factory, long interval, Mul
         this.interval = interval;
     }
 
-    @Override
     public void run() throws IOException, InterruptedException {
         this.stats = new SimpleScenarioStats(interval);
         for (MulticastParams p : params) {
@@ -48,12 +47,10 @@ public void run() throws IOException, InterruptedException {
         }
     }
 
-    @Override
     public SimpleScenarioStats getStats() {
         return stats;
     }
 
-    @Override
     public String getName() {
         return name;
     }

test/src/com/rabbitmq/examples/perf/SimpleScenarioStats.java

@@ -32,7 +32,6 @@ public SimpleScenarioStats(long interval) {
         super(interval);
     }
 
-    @Override
     protected void report(long now) {
         if (samples.size() == IGNORE_FIRST) {
             cumulativeLatencyTotal = 0;
@@ -56,7 +55,6 @@ protected void report(long now) {
         samples.add(sample);
     }
 
-    @Override
     public Map<String, Object> results() {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("send-msg-rate", getSendRate());

test/src/com/rabbitmq/examples/perf/VaryingScenario.java

@@ -19,7 +19,6 @@
 import com.rabbitmq.client.ConnectionFactory;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class VaryingScenario implements Scenario {
@@ -42,7 +41,6 @@ public VaryingScenario(String name, ConnectionFactory factory,
         this.variables = variables;
     }
 
-    @Override
     public void run() throws Exception {
         run(variables, new ArrayList<VariableValue>());
     }
@@ -76,15 +74,15 @@ private void run(Variable[] variables, List<VariableValue> values) throws Except
     }
 
     private Variable[] rest(Variable[] variables) {
-        return Arrays.copyOfRange(variables, 1, variables.length);
+        Variable[] tail = new Variable[variables.length - 1];
+        System.arraycopy(variables, 1, tail, 0, tail.length);
+        return tail;
     }
 
-    @Override
     public ScenarioStats getStats() {
         return stats;
     }
 
-    @Override
     public String getName() {
         return name;
     }

test/src/com/rabbitmq/examples/perf/VaryingScenarioStats.java

@@ -34,7 +34,6 @@ public SimpleScenarioStats next(List<VariableValue> value) {
         return stats;
     }
 
-    @Override
     public Map<String, Object> results() {
         Map<String, Object> map = new HashMap<String, Object>();