diff --git a/src/main/java/com/lazerycode/jmeter/analyzer/AnalyzeMojo.java b/src/main/java/com/lazerycode/jmeter/analyzer/AnalyzeMojo.java index 7b71239..802b5e6 100644 --- a/src/main/java/com/lazerycode/jmeter/analyzer/AnalyzeMojo.java +++ b/src/main/java/com/lazerycode/jmeter/analyzer/AnalyzeMojo.java @@ -1,14 +1,7 @@ package com.lazerycode.jmeter.analyzer; import com.lazerycode.jmeter.analyzer.config.Environment; -import com.lazerycode.jmeter.analyzer.config.RequestGroup; -import com.lazerycode.jmeter.analyzer.writer.ChartWriter; -import com.lazerycode.jmeter.analyzer.writer.DetailsToCsvWriter; -import com.lazerycode.jmeter.analyzer.writer.DetailsToHtmlWriter; -import com.lazerycode.jmeter.analyzer.writer.HtmlWriter; -import com.lazerycode.jmeter.analyzer.writer.SummaryJsonFileWriter; -import com.lazerycode.jmeter.analyzer.writer.SummaryTextToFileWriter; -import com.lazerycode.jmeter.analyzer.writer.SummaryTextToStdOutWriter; +import com.lazerycode.jmeter.analyzer.writer.*; import com.lazerycode.jmeter.analyzer.writer.Writer; import freemarker.template.TemplateException; import org.apache.maven.plugin.AbstractMojo; @@ -20,18 +13,11 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.xml.sax.SAXException; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; +import java.io.*; import java.util.*; import java.util.zip.GZIPInputStream; -import static com.lazerycode.jmeter.analyzer.config.Environment.ENVIRONMENT; -import static com.lazerycode.jmeter.analyzer.config.Environment.HTTPSAMPLE_ELEMENT_NAME; -import static com.lazerycode.jmeter.analyzer.config.Environment.SAMPLE_ELEMENT_NAME; +import static com.lazerycode.jmeter.analyzer.config.Environment.*; /** * Analyzes JMeter XML test report file and generates a report diff --git a/src/main/java/com/lazerycode/jmeter/analyzer/config/RequestGroup.java b/src/main/java/com/lazerycode/jmeter/analyzer/RequestGroup.java similarity index 89% rename from src/main/java/com/lazerycode/jmeter/analyzer/config/RequestGroup.java rename to src/main/java/com/lazerycode/jmeter/analyzer/RequestGroup.java index 476affd..49614bd 100644 --- a/src/main/java/com/lazerycode/jmeter/analyzer/config/RequestGroup.java +++ b/src/main/java/com/lazerycode/jmeter/analyzer/RequestGroup.java @@ -1,4 +1,4 @@ -package com.lazerycode.jmeter.analyzer.config; +package com.lazerycode.jmeter.analyzer; /** * Configuration POJO containing a name and pattern tuple. diff --git a/src/main/java/com/lazerycode/jmeter/analyzer/config/Environment.java b/src/main/java/com/lazerycode/jmeter/analyzer/config/Environment.java index 62065c5..067a003 100644 --- a/src/main/java/com/lazerycode/jmeter/analyzer/config/Environment.java +++ b/src/main/java/com/lazerycode/jmeter/analyzer/config/Environment.java @@ -1,12 +1,12 @@ package com.lazerycode.jmeter.analyzer.config; +import com.lazerycode.jmeter.analyzer.RequestGroup; import com.lazerycode.jmeter.analyzer.writer.Writer; import freemarker.ext.beans.BeansWrapper; import freemarker.template.Configuration; import org.apache.maven.plugin.logging.Log; import java.io.File; -import java.util.LinkedHashMap; import java.util.List; import java.util.Properties; import java.util.Set; diff --git a/src/main/java/com/lazerycode/jmeter/analyzer/parser/JMeterResultParser.java b/src/main/java/com/lazerycode/jmeter/analyzer/parser/JMeterResultParser.java index 97fef48..ffe0e36 100644 --- a/src/main/java/com/lazerycode/jmeter/analyzer/parser/JMeterResultParser.java +++ b/src/main/java/com/lazerycode/jmeter/analyzer/parser/JMeterResultParser.java @@ -1,6 +1,6 @@ package com.lazerycode.jmeter.analyzer.parser; -import com.lazerycode.jmeter.analyzer.config.RequestGroup; +import com.lazerycode.jmeter.analyzer.RequestGroup; import com.lazerycode.jmeter.analyzer.statistics.Samples; import org.apache.maven.plugin.logging.Log; import org.springframework.util.AntPathMatcher; @@ -14,11 +14,7 @@ import javax.xml.parsers.SAXParserFactory; import java.io.IOException; import java.io.Reader; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import static com.lazerycode.jmeter.analyzer.config.Environment.ENVIRONMENT; import static com.lazerycode.jmeter.analyzer.parser.StatusCodes.HTTPCODE_CONNECTIONERROR; diff --git a/src/main/java/com/lazerycode/jmeter/analyzer/statistics/Samples.java b/src/main/java/com/lazerycode/jmeter/analyzer/statistics/Samples.java index 978a491..8d56903 100644 --- a/src/main/java/com/lazerycode/jmeter/analyzer/statistics/Samples.java +++ b/src/main/java/com/lazerycode/jmeter/analyzer/statistics/Samples.java @@ -1,11 +1,6 @@ package com.lazerycode.jmeter.analyzer.statistics; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Collects samples (as a sequence of values of type "long") and provides the following values: diff --git a/src/main/java/com/lazerycode/jmeter/analyzer/util/FileUtil.java b/src/main/java/com/lazerycode/jmeter/analyzer/util/FileUtil.java index c8a4ee9..78d412f 100644 --- a/src/main/java/com/lazerycode/jmeter/analyzer/util/FileUtil.java +++ b/src/main/java/com/lazerycode/jmeter/analyzer/util/FileUtil.java @@ -3,12 +3,7 @@ import com.lazerycode.jmeter.analyzer.parser.AggregatedResponses; import org.codehaus.plexus.util.StringUtils; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; +import java.io.*; import java.net.URL; import java.net.URLConnection; import java.net.URLEncoder; diff --git a/src/main/java/com/lazerycode/jmeter/analyzer/writer/ChartWriter.java b/src/main/java/com/lazerycode/jmeter/analyzer/writer/ChartWriter.java index e10249d..b6e9794 100644 --- a/src/main/java/com/lazerycode/jmeter/analyzer/writer/ChartWriter.java +++ b/src/main/java/com/lazerycode/jmeter/analyzer/writer/ChartWriter.java @@ -12,12 +12,7 @@ import org.jfree.data.xy.XYSeries; import org.jfree.data.xy.XYSeriesCollection; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; +import java.io.*; import java.util.List; import java.util.Map; diff --git a/src/test/java/com/lazerycode/jmeter/analyzer/ResultAnalyzerTest.java b/src/test/java/com/lazerycode/jmeter/analyzer/ResultAnalyzerTest.java index c3628ca..47b8c92 100644 --- a/src/test/java/com/lazerycode/jmeter/analyzer/ResultAnalyzerTest.java +++ b/src/test/java/com/lazerycode/jmeter/analyzer/ResultAnalyzerTest.java @@ -1,7 +1,6 @@ package com.lazerycode.jmeter.analyzer; import com.lazerycode.jmeter.analyzer.config.Environment; -import com.lazerycode.jmeter.analyzer.config.RequestGroup; import com.lazerycode.jmeter.analyzer.writer.ChartWriter; import com.lazerycode.jmeter.analyzer.writer.DetailsToCsvWriter; import com.lazerycode.jmeter.analyzer.writer.DetailsToHtmlWriter; @@ -19,18 +18,14 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.Reader; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Properties; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import static com.lazerycode.jmeter.analyzer.config.Environment.ENVIRONMENT; import static com.lazerycode.jmeter.analyzer.writer.WriterTestHelper.normalizeFileContents;