Merge pull request #84 from Blazemeter/RELEASE_v3.1

Release v3.1

pom.xml

@@ -6,7 +6,7 @@
   <groupId>com.blazemeter</groupId>
   <artifactId>jmeter-bzm-correlation-recorder</artifactId>
   <packaging>jar</packaging>
-  <version>3.0</version>
+  <version>3.1</version>
   <name>Auto Correlation Recorder</name>
   <description>Auto Correlation Recorder as JMeter Plugin</description>
   <url>https://github.com/Blazemeter/CorrelationRecorder</url>

releases.json

@@ -40,5 +40,19 @@
       "json>=20190722",
       "maven-artifact>=3.8.4"
     ]
+  },
+  {
+    "version": "3.1",
+    "what_is_new": "Many improvements in generation of suggestions from templates!",
+    "dependencies": [
+      "jackson-dataformat-xml>=2.10.3",
+      "jackson-annotations>=2.13.3",
+      "jackson-databind>=2.10.3",
+      "jackson-core>=2.13.3",
+      "jackson-module-jaxb-annotations>=2.10.3",
+      "jmeter-bzm-commons>=0.2.1",
+      "json>=20190722",
+      "maven-artifact>=3.8.4"
+    ]
   }
 ]

src/main/java/com/blazemeter/jmeter/correlation/core/CorrelationEngine.java

@@ -88,6 +88,9 @@ public synchronized void process(HTTPSamplerBase sampler, List<TestElement> chil
     JMeterContextService.getContext().setVariables(vars);
     // Using for instead of streams to avoid ConcurrentModificationException
     for (CorrelationRule rule : rules) {
+      if (Thread.currentThread().isInterrupted()) {
+        break;
+      }
       if (rule.isEnabled() && rule.getCorrelationReplacement() != null) {
         try {
           rule.getCorrelationReplacement().process(sampler, children, result, vars);
@@ -106,6 +109,9 @@ public synchronized void process(HTTPSamplerBase sampler, List<TestElement> chil
     if (isContentTypeAllowed(result, responseFilter)) {
       // Using for instead of streams to avoid ConcurrentModificationException
       for (CorrelationRule rule : rules) {
+        if (Thread.currentThread().isInterrupted()) {
+          break;
+        }
         if (rule.isEnabled() && rule.getCorrelationExtractor() != null) {
           try {
             rule.getCorrelationExtractor().process(sampler, children, result, vars);

src/main/java/com/blazemeter/jmeter/correlation/core/analysis/Analysis.java

@@ -67,14 +67,15 @@ public Map<Template, List<CorrelationSuggestion>> run(List<Template> selectedTem
     setResultsSupplier(() -> JMeterElementUtils.getCurrentSampleResults(this.tracePath));
 
     Map<Template, List<CorrelationSuggestion>> suggestions = new HashMap<>();
+    AnalysisReporter.startCollecting(); // Start collecting
     for (Template template : selectedTemplates) {
-      AnalysisReporter.startCollecting();
       startAnalysisWithGroupRules(template.getGroups());
-      AnalysisReporter.stopCollecting();
       List<CorrelationSuggestion> correlationSuggestions =
           AnalysisReporter.generateCorrelationSuggestions();
       suggestions.put(template, correlationSuggestions);
+      AnalysisReporter.clear(); // Clear the current template suggestions
     }
+    AnalysisReporter.stopCollecting();
 
     enableCorrelation();
     LOG.trace("Analysis finished!");
@@ -117,7 +118,7 @@ public void disableCorrelation() {
   //With this method we will attempt to make the Analysis without triggering the recording
   public void startAnalysisWithGroupRules(List<RulesGroup> rulesGroups) {
     if (rulesGroups == null || rulesGroups.isEmpty()) {
-      LOG.error("No rules found. Using the default ones");
+      LOG.warn("No rules found. Using the default ones");
     }
 
     this.rulesGroups = rulesGroups;