moving models/code + removing refs to reporting module

agent/apiharness/pom.xml

@@ -21,6 +21,11 @@
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>cloudwatch</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>tank-api</artifactId>
@@ -71,12 +76,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>reporting-db</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>api</artifactId>

agent/apiharness/src/main/java/com/intuit/tank/harness/APIMonitor.java

@@ -23,7 +23,7 @@
 import com.intuit.tank.vm.vmManager.models.VMStatus;
 import com.intuit.tank.vm.vmManager.models.ValidationStatus;
 import com.intuit.tank.harness.logging.LogUtil;
-import com.intuit.tank.reporting.api.TPSInfoContainer;
+import com.intuit.tank.reporting.models.TPSInfoContainer;
 import com.intuit.tank.vm.agent.messages.WatsAgentStatusResponse;
 import com.intuit.tank.vm.api.enumerated.JobStatus;
 import com.intuit.tank.vm.api.enumerated.AgentCommand;

agent/apiharness/src/main/java/com/intuit/tank/harness/APITestHarness.java

@@ -48,10 +48,10 @@
 import com.intuit.tank.harness.logging.LogUtil;
 import com.intuit.tank.logging.LogEventType;
 import com.intuit.tank.logging.LoggingProfile;
-import com.intuit.tank.reporting.api.DummyResultsReporter;
-import com.intuit.tank.reporting.api.ResultsReporter;
-import com.intuit.tank.reporting.factory.ReportingFactory;
-import com.intuit.tank.results.TankResult;
+import com.intuit.tank.reporting.DummyResultsReporter;
+import com.intuit.tank.reporting.ResultsReporter;
+import com.intuit.tank.reporting.ReportingFactory;
+import com.intuit.tank.reporting.models.TankResult;
 import com.intuit.tank.vm.agent.messages.AgentData;
 import com.intuit.tank.vm.agent.messages.AgentTestStartData;
 import com.intuit.tank.vm.agent.messages.DataFileRequest;

agent/apiharness/src/main/java/com/intuit/tank/harness/TPSMonitor.java

@@ -26,8 +26,8 @@
 import org.apache.logging.log4j.Logger;
 
 import com.intuit.tank.http.BaseRequest;
-import com.intuit.tank.reporting.api.TPSInfo;
-import com.intuit.tank.reporting.api.TPSInfoContainer;
+import com.intuit.tank.reporting.models.TPSInfo;
+import com.intuit.tank.reporting.models.TPSInfoContainer;
 import com.intuit.tank.vm.settings.TimeUtil;
 
 public class TPSMonitor {

agent/apiharness/src/main/java/com/intuit/tank/harness/TestPlanStarter.java

@@ -14,7 +14,7 @@
  */
 
 import com.intuit.tank.harness.data.*;
-import com.intuit.tank.reporting.api.TPSInfoContainer;
+import com.intuit.tank.reporting.models.TPSInfoContainer;
 import com.intuit.tank.runner.TestPlanRunner;
 import com.intuit.tank.vm.api.enumerated.IncrementStrategy;
 import org.apache.commons.lang3.time.DateUtils;

agent/apiharness/src/main/java/com/intuit/tank/runner/method/RequestRunner.java

@@ -41,7 +41,7 @@
 import com.intuit.tank.http.xml.XMLRequest;
 import com.intuit.tank.logging.LogEventType;
 import com.intuit.tank.logging.LoggingProfile;
-import com.intuit.tank.results.TankResultBuilder;
+import com.intuit.tank.reporting.TankResultBuilder;
 import com.intuit.tank.runner.ErrorContainer;
 import com.intuit.tank.runner.TestStepContext;
 import com.intuit.tank.script.RequestDataPhase;

agent/apiharness/src/main/java/com/intuit/tank/runner/method/TimerMap.java

@@ -17,8 +17,8 @@
 import java.util.Map;
 
 import com.intuit.tank.harness.APITestHarness;
-import com.intuit.tank.results.TankResult;
-import com.intuit.tank.results.TankResultBuilder;
+import com.intuit.tank.reporting.models.TankResult;
+import com.intuit.tank.reporting.TankResultBuilder;
 
 public class TimerMap {
     private Map<String, TankResult> resultsMap = new HashMap<String, TankResult>();

agent/apiharness/src/main/java/com/intuit/tank/runner/method/TimerRunner.java

@@ -17,7 +17,7 @@
 
 import com.intuit.tank.harness.APITestHarness;
 import com.intuit.tank.harness.data.TimerStep;
-import com.intuit.tank.results.TankResult;
+import com.intuit.tank.reporting.models.TankResult;
 import com.intuit.tank.runner.TestStepContext;
 import com.intuit.tank.vm.common.TankConstants;
 

agent/apiharness/src/test/java/com/intuit/tank/harness/TPSMonitorTest.java

@@ -19,7 +19,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.intuit.tank.http.BaseRequest;
-import com.intuit.tank.reporting.api.TPSInfoContainer;
+import com.intuit.tank.reporting.models.TPSInfoContainer;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

agent/apiharness/src/test/java/com/intuit/tank/runner/method/TimerMapTest.java

@@ -17,7 +17,7 @@
  */
 import org.junit.jupiter.api.Test;
 
-import com.intuit.tank.results.TankResult;
+import com.intuit.tank.reporting.models.TankResult;
 
 /**
  * The class <code>TimerMapTest</code> contains tests for the class <code>{@link TimerMap}</code>.

api/src/main/java/com/intuit/tank/reporting/DummyResultsReader.java

@@ -0,0 +1,80 @@
+/**
+ *  Copyright 2015-2023 Intuit Inc.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ */
+package com.intuit.tank.reporting;
+
+import com.intuit.tank.reporting.models.TPSInfo;
+import com.intuit.tank.reporting.models.TankResult;
+import org.apache.commons.configuration.HierarchicalConfiguration;
+
+import java.util.*;
+
+/**
+ * DummyResultsReader
+ * 
+ * @author dangleton
+ * 
+ */
+public class DummyResultsReader implements ResultsReader {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<TankResult> getAllTimingResults(String jobId) {
+        return new ArrayList<TankResult>();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public PagedTimingResults getPagedTimingResults(String jobId, Object nextToken) {
+        return new PagedTimingResults(null, new ArrayList<TankResult>());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean hasTimingData(String jobId) {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void deleteTimingForJob(String jobId, boolean asynch) {
+        // no-op
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Map<Date, Map<String, TPSInfo>> getTpsMapForJob(Date minDate, String... jobId) {
+        return new HashMap<Date, Map<String, TPSInfo>>();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Map<Date, Map<String, TPSInfo>> getTpsMapForInstance(Date minDate, String jobId, String instanceId) {
+        return new HashMap<Date, Map<String, TPSInfo>>();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void config(HierarchicalConfiguration config) {
+        // no-op
+    }
+
+}

api/src/main/java/com/intuit/tank/reporting/DummyResultsReporter.java

@@ -0,0 +1,49 @@
+/**
+ *  Copyright 2015-2023 Intuit Inc.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ */
+package com.intuit.tank.reporting;
+
+import com.intuit.tank.reporting.models.TPSInfoContainer;
+import com.intuit.tank.reporting.models.TankResult;
+import org.apache.commons.configuration.HierarchicalConfiguration;
+
+import java.util.List;
+
+/**
+ * DummyResultsReporter
+ * 
+ * @author dangleton
+ * 
+ */
+public class DummyResultsReporter implements ResultsReporter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void sendTpsResults(String jobId, String instanceId, TPSInfoContainer container, boolean async) {
+        // do nothing
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void sendTimingResults(String jobId, String instanceId, List<TankResult> results, boolean asynch) {
+        // do nothing
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void config(HierarchicalConfiguration config) {
+        // do nothing
+
+    }
+
+}