You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2019/09/28 10:18:38 UTC
[jmeter] 01/04: Rename type to comply with naming conventions
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 5853f60e0fcd6c0a559ab1cac83a2b6a9b18fb79
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Sep 28 11:40:52 2019 +0200
Rename type to comply with naming conventions
---
.../org/apache/jmeter/report/dashboard/AbstractDataExporter.java | 4 ++--
.../org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/AbstractDataExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/AbstractDataExporter.java
index 39065c0..2e8ef1a 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/AbstractDataExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/AbstractDataExporter.java
@@ -119,8 +119,8 @@ public abstract class AbstractDataExporter implements DataExporter {
this.name = name;
}
- protected <TProperty> TProperty getPropertyFromConfig(
- SubConfiguration cfg, String property, TProperty defaultValue, Class<TProperty> clazz)
+ protected <T> T getPropertyFromConfig(
+ SubConfiguration cfg, String property, T defaultValue, Class<T> clazz)
throws ExportException {
try {
return cfg.getProperty(property, defaultValue, clazz);
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
index 1507916..1c0b427 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
@@ -465,15 +465,15 @@ public class HtmlTemplateExporter extends AbstractDataExporter {
log.debug("End of template processing");
}
- private <TVisit> void addResultToContext(
+ private <T> void addResultToContext(
String resultKey, Map<String, Object> storage,
- DataContext dataContext, ResultDataVisitor<TVisit> visitor) {
+ DataContext dataContext, ResultDataVisitor<T> visitor) {
addResultToContext(resultKey, storage, dataContext, visitor, null, null);
}
- private <TVisit> void addResultToContext(
+ private <T> void addResultToContext(
String resultKey, Map<String, Object> storage, DataContext dataContext,
- ResultDataVisitor<TVisit> visitor, ResultCustomizer customizer, ResultChecker checker) {
+ ResultDataVisitor<T> visitor, ResultCustomizer customizer, ResultChecker checker) {
Object data = storage.get(resultKey);
if (data instanceof ResultData) {
ResultData result = (ResultData) data;