From b9de36ac93d31b3e68eeb2e3419d1cf267103077 Mon Sep 17 00:00:00 2001
From: Alex Ivimey <al609499@dal.ca>
Date: Fri, 12 Jul 2024 14:05:29 -0300
Subject: [PATCH] Refactor #3 Long identifier, changed getter and setter names
 along with constant property value. Updated its usages

---
 .../javadsl/core/listeners/AutoStopListener.java |  2 +-
 .../autostop/AutoStopConditionElement.java       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jmeter-java-dsl/src/main/java/us/abstracta/jmeter/javadsl/core/listeners/AutoStopListener.java b/jmeter-java-dsl/src/main/java/us/abstracta/jmeter/javadsl/core/listeners/AutoStopListener.java
index fc33386d..3a4f358d 100644
--- a/jmeter-java-dsl/src/main/java/us/abstracta/jmeter/javadsl/core/listeners/AutoStopListener.java
+++ b/jmeter-java-dsl/src/main/java/us/abstracta/jmeter/javadsl/core/listeners/AutoStopListener.java
@@ -394,7 +394,7 @@ protected AggregatedConditionBuilder(AutoStopConditionElement ret,
      * @return a condition builder to complete the condition definition.
      */
     public AggregatedConditionBuilder<T> every(Duration period) {
-      ret.setAggregationResetPeriodSeconds(period.getSeconds());
+      ret.setResetPeriodSeconds(period.getSeconds());
       return this;
     }
 
diff --git a/jmeter-java-dsl/src/main/java/us/abstracta/jmeter/javadsl/core/listeners/autostop/AutoStopConditionElement.java b/jmeter-java-dsl/src/main/java/us/abstracta/jmeter/javadsl/core/listeners/autostop/AutoStopConditionElement.java
index 50ab4f3a..c8c93da2 100644
--- a/jmeter-java-dsl/src/main/java/us/abstracta/jmeter/javadsl/core/listeners/autostop/AutoStopConditionElement.java
+++ b/jmeter-java-dsl/src/main/java/us/abstracta/jmeter/javadsl/core/listeners/autostop/AutoStopConditionElement.java
@@ -17,7 +17,7 @@ public class AutoStopConditionElement extends AbstractTestElement {
   private static final String METRIC_PROP = "metric";
   private static final String AGGREGATION_PROP = "aggregation";
   private static final String PERCENTILE_PROP = "percentile";
-  private static final String AGGREGATION_RESET_PERIOD_SECONDS_PROP =
+  private static final String RESET_PERIOD_SECONDS_PROP =
       "aggregationResetPeriodSeconds";
   private static final String COMPARISON_PROP = "comparison";
   private static final String VALUE_PROP = "value";
@@ -60,12 +60,12 @@ public void setPercentile(double percentile) {
     setProperty(new DoubleProperty(PERCENTILE_PROP, percentile));
   }
 
-  public long getAggregationResetPeriodSeconds() {
-    return getPropertyAsLong(AGGREGATION_RESET_PERIOD_SECONDS_PROP);
+  public long getResetPeriodSeconds() {
+    return getPropertyAsLong(RESET_PERIOD_SECONDS_PROP);
   }
 
-  public void setAggregationResetPeriodSeconds(long aggregationResetPeriod) {
-    setProperty(AGGREGATION_RESET_PERIOD_SECONDS_PROP, aggregationResetPeriod);
+  public void setResetPeriodSeconds(long aggregationResetPeriod) {
+    setProperty(RESET_PERIOD_SECONDS_PROP, aggregationResetPeriod);
   }
 
   public String getComparison() {
@@ -124,7 +124,7 @@ public boolean eval(SampleResult result) {
     if (getRegex() != null && !result.getSampleLabel().matches(getRegex())) {
       return false;
     }
-    return getAggregationResetPeriodSeconds() == 0 ? isMatchNow(result) : isMatchSlot(result);
+    return getResetPeriodSeconds() == 0 ? isMatchNow(result) : isMatchSlot(result);
   }
 
   private boolean isMatchNow(SampleResult result) {
@@ -160,7 +160,7 @@ private Duration getHoldsForDuration() {
   private boolean isMatchSlot(SampleResult result) {
     Instant currentSlotStart = findSlotStart();
     while (!slotStart.equals(currentSlotStart)) {
-      Instant slotEnd = slotStart.plusSeconds(getAggregationResetPeriodSeconds());
+      Instant slotEnd = slotStart.plusSeconds(getResetPeriodSeconds());
       if (isMatchAt(slotEnd)) {
         return true;
       }
@@ -173,7 +173,7 @@ private boolean isMatchSlot(SampleResult result) {
 
   private Instant findSlotStart() {
     long startMillis = slotStart.toEpochMilli();
-    long slotMillis = getAggregationResetPeriodSeconds() * 1000;
+    long slotMillis = getResetPeriodSeconds() * 1000;
     long nowMillis = clock.instant().toEpochMilli();
     return slotStart.plusMillis(((nowMillis - startMillis) / slotMillis) * slotMillis);
   }