You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2015/12/08 23:42:43 UTC
svn commit: r1718734 - in /jmeter/trunk/src:
components/org/apache/jmeter/extractor/json/jsonpath/
core/org/apache/jmeter/report/config/ core/org/apache/jmeter/report/core/
core/org/apache/jmeter/report/dashboard/
core/org/apache/jmeter/report/processo...
Author: sebb
Date: Tue Dec 8 22:42:43 2015
New Revision: 1718734
URL: http://svn.apache.org/viewvc?rev=1718734&view=rev
Log:
Redundant specification of type arguments
Modified:
jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
jmeter/trunk/src/core/org/apache/jmeter/report/config/Converters.java
jmeter/trunk/src/core/org/apache/jmeter/report/config/ExporterConfiguration.java
jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetadata.java
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/JsonizerVisitor.java
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleProcessor.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ListResultData.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/MapResultData.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleContext.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/TaggerConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/GroupData.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/SeriesData.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java Tue Dec 8 22:42:43 2015
@@ -36,8 +36,7 @@ public class JSONManager {
* store the computed JsonPath for the set of JSON Path Expressions.
* Usually there will be 1 to Maximum 10 elements
*/
- private Map<String, JsonPath> expressionToJsonPath = new HashMap<String, JsonPath>(
- 2);
+ private Map<String, JsonPath> expressionToJsonPath = new HashMap<>(2);
private JsonPath getJsonPath(String jsonPathExpression) {
JsonPath jsonPath = expressionToJsonPath.get(jsonPathExpression);
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/Converters.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/Converters.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/Converters.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/Converters.java Tue Dec 8 22:42:43 2015
@@ -27,7 +27,7 @@ import java.util.HashMap;
*/
public final class Converters {
- private static HashMap<Class<?>, StringConverter<?>> converters = new HashMap<Class<?>, StringConverter<?>>();
+ private static HashMap<Class<?>, StringConverter<?>> converters = new HashMap<>();
static {
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/ExporterConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/ExporterConfiguration.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/ExporterConfiguration.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/ExporterConfiguration.java Tue Dec 8 22:42:43 2015
@@ -27,7 +27,7 @@ import java.util.Map;
*/
public class ExporterConfiguration extends InstanceConfiguration {
- private final HashMap<String, SubConfiguration> graphExtraConfigurations = new HashMap<String, SubConfiguration>();
+ private final HashMap<String, SubConfiguration> graphExtraConfigurations = new HashMap<>();
private boolean filtersOnlySampleSeries;
private String seriesFilter;
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java Tue Dec 8 22:42:43 2015
@@ -123,9 +123,9 @@ public class ReportGeneratorConfiguratio
private File tempDirectory;
private long apdexSatisfiedThreshold;
private long apdexToleratedThreshold;
- private ArrayList<String> filteredSamples = new ArrayList<String>();
- private HashMap<String, ExporterConfiguration> exportConfigurations = new HashMap<String, ExporterConfiguration>();
- private HashMap<String, GraphConfiguration> graphConfigurations = new HashMap<String, GraphConfiguration>();
+ private ArrayList<String> filteredSamples = new ArrayList<>();
+ private HashMap<String, ExporterConfiguration> exportConfigurations = new HashMap<>();
+ private HashMap<String, GraphConfiguration> graphConfigurations = new HashMap<>();
/**
* Gets the overall sample filter.
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java Tue Dec 8 22:42:43 2015
@@ -27,7 +27,7 @@ import java.util.Map;
*/
public class SubConfiguration {
- private HashMap<String, String> properties = new HashMap<String, String>();
+ private HashMap<String, String> properties = new HashMap<>();
/**
* Gets the properties of the item.
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetadata.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetadata.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetadata.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetadata.java Tue Dec 8 22:42:43 2015
@@ -40,7 +40,7 @@ public class SampleMetadata {
List<String> columns;
/** Index to map column names to their corresponding indexes */
- private TreeMap<String, Integer> index = new TreeMap<String, Integer>();
+ private TreeMap<String, Integer> index = new TreeMap<>();
/** character separator used for separating columns */
private char separator;
@@ -63,7 +63,7 @@ public class SampleMetadata {
public SampleMetadata(SampleSaveConfiguration saveConfig) {
if (saveConfig == null)
throw new ArgumentNullException("saveConfig");
- ArrayList<String> columns = new ArrayList<String>();
+ ArrayList<String> columns = new ArrayList<>();
if (saveConfig.saveTimestamp()) {
columns.add(CSVSaveService.TIME_STAMP);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/JsonizerVisitor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/JsonizerVisitor.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/JsonizerVisitor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/JsonizerVisitor.java Tue Dec 8 22:42:43 2015
@@ -74,7 +74,7 @@ public class JsonizerVisitor implements
public String visitMapResult(MapResultData mapResult) {
String result = "";
if (mapResult != null) {
- HashMap<String, String> map = new HashMap<String, String>();
+ HashMap<String, String> map = new HashMap<>();
for (Map.Entry<String, ResultData> entry : mapResult.entrySet()) {
map.put(entry.getKey(), entry.getValue().accept(this));
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java Tue Dec 8 22:42:43 2015
@@ -291,7 +291,7 @@ public class ReportGenerator {
.getGraphConfigurations();
// Process configuration to build graph consumers
- HashMap<GraphConfiguration, AbstractGraphConsumer> graphMap = new HashMap<GraphConfiguration, AbstractGraphConsumer>();
+ HashMap<GraphConfiguration, AbstractGraphConsumer> graphMap = new HashMap<>();
for (Map.Entry<String, GraphConfiguration> entryGraphCfg : graphConfigurations
.entrySet()) {
String graphName = entryGraphCfg.getKey();
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java Tue Dec 8 22:42:43 2015
@@ -55,13 +55,13 @@ abstract public class AbstractSampleCons
* samples consumers that will consume sample produced by this sample
* consumer (which is also a sample producer)
*/
- private List<SampleConsumer> sampleConsumers = new ArrayList<SampleConsumer>();
+ private List<SampleConsumer> sampleConsumers = new ArrayList<>();
/**
* index of sample metadata consumed by this consumer. Indexed by channel
* numbers
*/
- private Map<Integer, SampleMetadata> consumedMetadata = new TreeMap<Integer, SampleMetadata>();
+ private Map<Integer, SampleMetadata> consumedMetadata = new TreeMap<>();
/**
* Gets the data identified by the specified key from the current sample
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleProcessor.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleProcessor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleProcessor.java Tue Dec 8 22:42:43 2015
@@ -30,7 +30,7 @@ public class AbstractSampleProcessor imp
private SampleContext sampleContext;
- private ArrayList<ChannelContext> channelContexts = new ArrayList<ChannelContext>();
+ private ArrayList<ChannelContext> channelContexts = new ArrayList<>();
/*
* (non-Javadoc)
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java Tue Dec 8 22:42:43 2015
@@ -88,7 +88,7 @@ public abstract class AbstractSummaryCon
public static final String RESULT_VALUE_SUPPORTS_CONTROLLERS_DISCRIMINATION = "supportsControllersDiscrimination";
public static final String RESULT_VALUE_TITLES = "titles";
- private final Map<String, SummaryInfo> infos = new HashMap<String, SummaryInfo>();
+ private final Map<String, SummaryInfo> infos = new HashMap<>();
private final SummaryInfo overallInfo = new SummaryInfo(false);
private final boolean supportsControllersDiscrimination;
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java Tue Dec 8 22:42:43 2015
@@ -253,7 +253,7 @@ public class CsvFileSampleSource extends
private class PrivateProducer extends AbstractSampleProcessor implements
SampleProducer {
- private List<SampleConsumer> sampleConsumers = new ArrayList<SampleConsumer>();
+ private List<SampleConsumer> sampleConsumers = new ArrayList<>();
public void setSampleConsumers(List<SampleConsumer> consumers) {
if (consumers == null)
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java Tue Dec 8 22:42:43 2015
@@ -90,7 +90,7 @@ public class ExternalSampleSorter extend
private SampleComparator sampleComparator;
- private BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<Runnable>();
+ private BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<>();
private ThreadPoolExecutor pool;
@@ -295,8 +295,8 @@ public class ExternalSampleSorter extend
this.pool.prestartAllCoreThreads();
inputSampleCount = 0;
chunkedSampleCount = 0;
- chunks = new LinkedList<File>();
- samples = new LinkedList<Sample>();
+ chunks = new LinkedList<>();
+ samples = new LinkedList<>();
sampleMetadata = getConsumedMetadata(0);
sampleComparator.initialize(sampleMetadata);
}
@@ -430,7 +430,7 @@ public class ExternalSampleSorter extend
}
private List<Sample> merge(List<Sample> left, List<Sample> right) {
- ArrayList<Sample> out = new ArrayList<Sample>();
+ ArrayList<Sample> out = new ArrayList<>();
ListIterator<Sample> l = left.listIterator();
ListIterator<Sample> r = right.listIterator();
while (l.hasNext() || r.hasNext()) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/ListResultData.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/ListResultData.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/ListResultData.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/ListResultData.java Tue Dec 8 22:42:43 2015
@@ -30,7 +30,7 @@ import org.apache.jmeter.report.core.Arg
public class ListResultData implements ResultData, Iterable<ResultData> {
/** The items. */
- private ArrayList<ResultData> items = new ArrayList<ResultData>();
+ private ArrayList<ResultData> items = new ArrayList<>();
/*
* (non-Javadoc)
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/MapResultData.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/MapResultData.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/MapResultData.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/MapResultData.java Tue Dec 8 22:42:43 2015
@@ -31,7 +31,7 @@ import org.apache.jmeter.report.core.Arg
*/
public class MapResultData implements ResultData {
- private HashMap<String, ResultData> map = new HashMap<String, ResultData>();
+ private HashMap<String, ResultData> map = new HashMap<>();
/*
* (non-Javadoc)
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleContext.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleContext.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleContext.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleContext.java Tue Dec 8 22:42:43 2015
@@ -30,7 +30,7 @@ import java.util.Map;
public class SampleContext {
private File workingDirectory;
- private HashMap<String, Object> data = new HashMap<String, Object>();
+ private HashMap<String, Object> data = new HashMap<>();
/**
* Return the root directory that consumers are authorized to use for
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/TaggerConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/TaggerConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/TaggerConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/TaggerConsumer.java Tue Dec 8 22:42:43 2015
@@ -39,7 +39,7 @@ public class TaggerConsumer<TIndex> exte
public static final String DEFAULT_TAG_LABEL = "Tag";
// Collection of sample builders for channels
- private ArrayList<SampleBuilder> builders = new ArrayList<SampleBuilder>();
+ private ArrayList<SampleBuilder> builders = new ArrayList<>();
private SampleIndexer<TIndex> sampleIndexer;
private String tagLabel = DEFAULT_TAG_LABEL;
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -206,7 +206,7 @@ public abstract class AbstractGraphConsu
*/
protected AbstractGraphConsumer() {
keysSelector = createKeysSelector();
- groupInfos = new HashMap<String, GroupInfo>(createGroupInfos());
+ groupInfos = new HashMap<>(createGroupInfos());
}
protected abstract GraphKeysSelector createKeysSelector();
@@ -274,7 +274,7 @@ public abstract class AbstractGraphConsu
aggInfo = seriesData.getAggregatorInfo();
} else {
series = String.format(aggregatedKeysSeriesFormat, series);
- aggInfo = new HashMap<Double, Aggregator>();
+ aggInfo = new HashMap<>();
aggInfo.put(seriesData.getKeysAggregator().getResult(),
seriesData.getValuesAggregator());
}
@@ -306,7 +306,7 @@ public abstract class AbstractGraphConsu
long count = seriesData.getCount();
int rank = 0;
double percent = 0;
- TreeMap<Double, Aggregator> sortedInfo = new TreeMap<Double, Aggregator>(
+ TreeMap<Double, Aggregator> sortedInfo = new TreeMap<>(
aggInfo);
if (revertsKeysAndValues == false) {
for (Map.Entry<Double, Aggregator> entry : sortedInfo
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -200,9 +200,9 @@ public abstract class AbstractVersusRequ
}
// Collection of sample builders for channels
- private ArrayList<SampleBuilder> builders = new ArrayList<SampleBuilder>();
- private ArrayList<FileInfo> fileInfos = new ArrayList<FileInfo>();
- private HashMap<Long, Long> counts = new HashMap<Long, Long>();
+ private ArrayList<SampleBuilder> builders = new ArrayList<>();
+ private ArrayList<FileInfo> fileInfos = new ArrayList<>();
+ private HashMap<Long, Long> counts = new HashMap<>();
boolean createdWorkDir = false;
private final AbstractVersusRequestsGraphConsumer parent;
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/GroupData.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/GroupData.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/GroupData.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/GroupData.java Tue Dec 8 22:42:43 2015
@@ -25,7 +25,7 @@ import org.apache.jmeter.report.processo
* The class GroupData helps to store group data for a graph.
*/
public class GroupData {
- private final HashMap<String, SeriesData> seriesData = new HashMap<String, SeriesData>();
+ private final HashMap<String, SeriesData> seriesData = new HashMap<>();
private final SeriesData overallSeries;
/**
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java Tue Dec 8 22:42:43 2015
@@ -32,7 +32,7 @@ import org.apache.jmeter.report.core.Sam
public class IndexedNameSelector implements GraphKeysSelector {
/** The names. */
- private LinkedList<String> names = new LinkedList<String>();
+ private LinkedList<String> names = new LinkedList<>();
/**
* Gets the names.
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/SeriesData.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/SeriesData.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/SeriesData.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/SeriesData.java Tue Dec 8 22:42:43 2015
@@ -31,7 +31,7 @@ import org.apache.jmeter.report.processo
public class SeriesData {
/** The regular groupData. */
- private final HashMap<Double, Aggregator> aggregators = new HashMap<Double, Aggregator>();
+ private final HashMap<Double, Aggregator> aggregators = new HashMap<>();
/** The keys aggregator for aggregated keys seriesData. */
private final Aggregator keysAggregator;
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -60,8 +60,7 @@ public class ActiveThreadsGraphConsumer
*/
@Override
protected Map<String, GroupInfo> createGroupInfos() {
- HashMap<String, GroupInfo> groupInfos = new HashMap<String, GroupInfo>(
- 1);
+ HashMap<String, GroupInfo> groupInfos = new HashMap<>(1);
groupInfos.put(AbstractGraphConsumer.DEFAULT_GROUP, new GroupInfo(
new MeanAggregatorFactory(), new AbstractSeriesSelector() {
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -63,8 +63,7 @@ public class BytesThroughputGraphConsume
*/
@Override
protected Map<String, GroupInfo> createGroupInfos() {
- HashMap<String, GroupInfo> groupInfos = new HashMap<String, GroupInfo>(
- 2);
+ HashMap<String, GroupInfo> groupInfos = new HashMap<>(2);
groupInfos.put(AbstractGraphConsumer.DEFAULT_GROUP, new GroupInfo(
new TimeRateAggregatorFactory(), new AbstractSeriesSelector() {
private final Iterable<String> values = Arrays.asList(
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -58,8 +58,7 @@ public class CodesPerSecondGraphConsumer
*/
@Override
protected Map<String, GroupInfo> createGroupInfos() {
- HashMap<String, GroupInfo> groupInfos = new HashMap<String, GroupInfo>(
- 1);
+ HashMap<String, GroupInfo> groupInfos = new HashMap<>(1);
groupInfos.put(AbstractGraphConsumer.DEFAULT_GROUP, new GroupInfo(
new TimeRateAggregatorFactory(), new CodeSeriesSelector(),
new CountValueSelector(), false, false));
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -58,8 +58,7 @@ public class HitsPerSecondGraphConsumer
*/
@Override
protected Map<String, GroupInfo> createGroupInfos() {
- HashMap<String, GroupInfo> groupInfos = new HashMap<String, GroupInfo>(
- 1);
+ HashMap<String, GroupInfo> groupInfos = new HashMap<>(1);
groupInfos.put(AbstractGraphConsumer.DEFAULT_GROUP, new GroupInfo(
new TimeRateAggregatorFactory(), new StaticSeriesSelector(),
new CountValueSelector(), false, false));
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -58,7 +58,7 @@ public class LatencyOverTimeGraphConsume
*/
@Override
protected Map<String, GroupInfo> createGroupInfos() {
- HashMap<String, GroupInfo> groupInfos = new HashMap<String, GroupInfo>();
+ HashMap<String, GroupInfo> groupInfos = new HashMap<>();
groupInfos.put(AbstractGraphConsumer.DEFAULT_GROUP, new GroupInfo(
new MeanAggregatorFactory(), new NameSeriesSelector(),
new LatencyValueSelector(), false, false));
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -64,8 +64,7 @@ public class LatencyVSRequestGraphConsum
*/
@Override
protected Map<String, GroupInfo> createGroupInfos() {
- HashMap<String, GroupInfo> groupInfos = new HashMap<String, GroupInfo>(
- 1);
+ HashMap<String, GroupInfo> groupInfos = new HashMap<>(1);
groupInfos.put(AbstractGraphConsumer.DEFAULT_GROUP, new GroupInfo(
new MedianAggregatorFactory(), new StatusSeriesSelector(),
new LatencyValueSelector(), false, false));
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -86,8 +86,7 @@ public class ResponseTimeDistributionGra
*/
@Override
protected Map<String, GroupInfo> createGroupInfos() {
- HashMap<String, GroupInfo> groupInfos = new HashMap<String, GroupInfo>(
- 1);
+ HashMap<String, GroupInfo> groupInfos = new HashMap<>(1);
groupInfos.put(AbstractGraphConsumer.DEFAULT_GROUP, new GroupInfo(
new SumAggregatorFactory(), new NameSeriesSelector(),
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -59,8 +59,7 @@ public class ResponseTimeOverTimeGraphCo
*/
@Override
protected Map<String, GroupInfo> createGroupInfos() {
- HashMap<String, GroupInfo> groupInfos = new HashMap<String, GroupInfo>(
- 1);
+ HashMap<String, GroupInfo> groupInfos = new HashMap<>(1);
groupInfos.put(AbstractGraphConsumer.DEFAULT_GROUP, new GroupInfo(
new MeanAggregatorFactory(), new NameSeriesSelector(),
new ElapsedTimeValueSelector(), false, false));
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -90,8 +90,7 @@ public class ResponseTimePerSampleGraphC
*/
@Override
protected Map<String, GroupInfo> createGroupInfos() {
- HashMap<String, GroupInfo> groupInfos = new HashMap<String, GroupInfo>(
- 2);
+ HashMap<String, GroupInfo> groupInfos = new HashMap<>(2);
groupInfos.put("aggregate_rpt_pct1",
createGroupInfo("aggregate_rpt_pct1", 90));
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -68,8 +68,7 @@ public class ResponseTimePercentilesGrap
*/
@Override
protected Map<String, GroupInfo> createGroupInfos() {
- HashMap<String, GroupInfo> groupInfos = new HashMap<String, GroupInfo>(
- 1);
+ HashMap<String, GroupInfo> groupInfos = new HashMap<>(1);
groupInfos.put(AbstractGraphConsumer.DEFAULT_GROUP, new GroupInfo(
new SumAggregatorFactory(), new NameSeriesSelector(),
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -64,8 +64,7 @@ public class ResponseTimeVSRequestGraphC
*/
@Override
protected Map<String, GroupInfo> createGroupInfos() {
- HashMap<String, GroupInfo> groupInfos = new HashMap<String, GroupInfo>(
- 1);
+ HashMap<String, GroupInfo> groupInfos = new HashMap<>(1);
groupInfos.put(AbstractGraphConsumer.DEFAULT_GROUP, new GroupInfo(
new MedianAggregatorFactory(), new StatusSeriesSelector(),
new ElapsedTimeValueSelector(), false, false));
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -61,8 +61,7 @@ public class TimeVSThreadGraphConsumer e
*/
@Override
protected Map<String, GroupInfo> createGroupInfos() {
- HashMap<String, GroupInfo> groupInfos = new HashMap<String, GroupInfo>(
- 1);
+ HashMap<String, GroupInfo> groupInfos = new HashMap<>(1);
groupInfos.put(AbstractGraphConsumer.DEFAULT_GROUP, new GroupInfo(
new MeanAggregatorFactory(), new NameSeriesSelector(),
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java?rev=1718734&r1=1718733&r2=1718734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java Tue Dec 8 22:42:43 2015
@@ -65,8 +65,7 @@ public class TransactionsPerSecondGraphC
*/
@Override
protected Map<String, GroupInfo> createGroupInfos() {
- HashMap<String, GroupInfo> groupInfos = new HashMap<String, GroupInfo>(
- 1);
+ HashMap<String, GroupInfo> groupInfos = new HashMap<>(1);
groupInfos.put(AbstractGraphConsumer.DEFAULT_GROUP, new GroupInfo(
new TimeRateAggregatorFactory(), new AbstractSeriesSelector(
true) {