Optimized imports

telekom · Nov 5, 2021 · e94bb8b · e94bb8b
1 parent 26e93f7
commit e94bb8b
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 54 deletions.
diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/FailsAnnotationConverter.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/FailsAnnotationConverter.java
@@ -22,9 +22,10 @@
 package eu.tsystems.mms.tic.testframework.report;
 
 import eu.tsystems.mms.tic.testframework.annotations.Fails;
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
 
 public class FailsAnnotationConverter implements AnnotationConverter<Fails> {
 

diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/TestAnnotationConverter.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/TestAnnotationConverter.java
@@ -21,11 +21,12 @@
 
 package eu.tsystems.mms.tic.testframework.report;
 
-import java.util.HashMap;
-import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.testng.annotations.Test;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class TestAnnotationConverter implements AnnotationConverter<Test> {
 
     @Override

diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/TestStatusController.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/TestStatusController.java
@@ -29,15 +29,17 @@
 import eu.tsystems.mms.tic.testframework.logging.Loggable;
 import eu.tsystems.mms.tic.testframework.report.model.context.MethodContext;
 import eu.tsystems.mms.tic.testframework.report.utils.ExecutionContextController;
+import org.testng.ITestResult;
+import org.testng.SkipException;
+
 import java.lang.reflect.Method;
 import java.util.Date;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.testng.ITestResult;
-import org.testng.SkipException;
+
 import static eu.tsystems.mms.tic.testframework.report.utils.ExecutionContextController.getCurrentExecutionContext;
 
 public class TestStatusController implements TestStatusUpdateEvent.Listener, Loggable {

diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/TesterraListener.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/TesterraListener.java
@@ -50,7 +50,6 @@
 import eu.tsystems.mms.tic.testframework.report.model.steps.TestStep;
 import eu.tsystems.mms.tic.testframework.report.utils.DefaultTestNGContextGenerator;
 import eu.tsystems.mms.tic.testframework.report.utils.ExecutionContextController;
-import java.util.Locale;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configurator;
@@ -74,6 +73,7 @@
 import org.testng.xml.XmlSuite;
 
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Listener for JUnit and TestNg, collects test informations for testreport.

diff --git a/...src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/AbstractContext.java b/...src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/AbstractContext.java
@@ -24,21 +24,17 @@
 import eu.tsystems.mms.tic.testframework.exceptions.SystemException;
 import eu.tsystems.mms.tic.testframework.internal.IDUtils;
 import eu.tsystems.mms.tic.testframework.logging.Loggable;
-import eu.tsystems.mms.tic.testframework.report.TestStatusController;
+import org.apache.commons.lang3.time.DurationFormatUtils;
+
 import java.time.Duration;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.commons.lang3.time.DurationFormatUtils;
 
 public abstract class AbstractContext implements SynchronizableContext, Loggable {
     protected String name;

diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/ErrorContext.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/ErrorContext.java
@@ -22,13 +22,10 @@
 package eu.tsystems.mms.tic.testframework.report.model.context;
 
 import eu.tsystems.mms.tic.testframework.interop.TestEvidenceCollector;
-import eu.tsystems.mms.tic.testframework.report.TestStatusController;
 import eu.tsystems.mms.tic.testframework.report.utils.ExecutionUtils;
 import eu.tsystems.mms.tic.testframework.utils.SourceUtils;
-import java.util.LinkedHashMap;
-import java.util.Map;
+
 import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class ErrorContext {
     private transient Throwable throwable = null;

diff --git a/...rc/main/java/eu/tsystems/mms/tic/testframework/report/model/context/ExecutionContext.java b/...rc/main/java/eu/tsystems/mms/tic/testframework/report/model/context/ExecutionContext.java
@@ -23,18 +23,13 @@
 
 import com.google.common.eventbus.EventBus;
 import eu.tsystems.mms.tic.testframework.events.ContextUpdateEvent;
-import eu.tsystems.mms.tic.testframework.internal.Flags;
-import eu.tsystems.mms.tic.testframework.report.FailureCorridor;
-import eu.tsystems.mms.tic.testframework.report.TestStatusController;
 import eu.tsystems.mms.tic.testframework.report.TesterraListener;
-import java.util.Arrays;
-import java.util.Map;
+import org.testng.ITestContext;
+import org.testng.ITestResult;
+
 import java.util.Queue;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.stream.Stream;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
 
 public class ExecutionContext extends AbstractContext implements SynchronizableContext {
     private final Queue<SuiteContext> suiteContexts = new ConcurrentLinkedQueue<>();

diff --git a/.../src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/SessionContext.java b/.../src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/SessionContext.java
@@ -22,15 +22,13 @@
 package eu.tsystems.mms.tic.testframework.report.model.context;
 
 import eu.tsystems.mms.tic.testframework.model.NodeInfo;
-import eu.tsystems.mms.tic.testframework.report.TestStatusController;
 import eu.tsystems.mms.tic.testframework.webdrivermanager.WebDriverRequest;
-import java.net.URL;
+
 import java.util.Map;
 import java.util.Optional;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.stream.Stream;
-import org.apache.commons.lang3.SerializationUtils;
 
 public class SessionContext extends AbstractContext implements SynchronizableContext {
     private String remoteSessionId;

diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/SuiteContext.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/SuiteContext.java
@@ -23,13 +23,13 @@
 
 import com.google.common.eventbus.EventBus;
 import eu.tsystems.mms.tic.testframework.events.ContextUpdateEvent;
-import eu.tsystems.mms.tic.testframework.report.TestStatusController;
 import eu.tsystems.mms.tic.testframework.report.TesterraListener;
+import org.testng.ITestContext;
+import org.testng.ITestResult;
+
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.stream.Stream;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
 
 public class SuiteContext extends AbstractContext implements SynchronizableContext {
     private final Queue<TestContext> testContexts = new ConcurrentLinkedQueue<>();

diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/TestContext.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/context/TestContext.java
@@ -25,18 +25,17 @@
 import com.google.common.eventbus.EventBus;
 import eu.tsystems.mms.tic.testframework.annotations.TestClassContext;
 import eu.tsystems.mms.tic.testframework.events.ContextUpdateEvent;
-import eu.tsystems.mms.tic.testframework.report.TestStatusController;
 import eu.tsystems.mms.tic.testframework.report.TesterraListener;
 import eu.tsystems.mms.tic.testframework.report.utils.DefaultTestNGContextGenerator;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.stream.Stream;
 import org.testng.IClass;
-import org.testng.IInvokedMethod;
 import org.testng.ITestContext;
 import org.testng.ITestNGMethod;
 import org.testng.ITestResult;
 
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.stream.Stream;
+
 /**
  * Representation of a TestNG {@link ITestContext}
  */

diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/steps/TestStepAction.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/model/steps/TestStepAction.java
@@ -22,18 +22,18 @@
  package eu.tsystems.mms.tic.testframework.report.model.steps;
 
 import eu.tsystems.mms.tic.testframework.clickpath.ClickPathEvent;
-import eu.tsystems.mms.tic.testframework.report.model.context.LogMessage;
 import eu.tsystems.mms.tic.testframework.report.model.Serial;
 import eu.tsystems.mms.tic.testframework.report.model.context.ErrorContext;
+import eu.tsystems.mms.tic.testframework.report.model.context.LogMessage;
 import eu.tsystems.mms.tic.testframework.report.model.context.Screenshot;
+import org.apache.logging.log4j.core.LogEvent;
 
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.apache.logging.log4j.core.LogEvent;
 
 public class TestStepAction implements Serializable {
 

diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/perf/PerfTestContainer.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/perf/PerfTestContainer.java
@@ -22,14 +22,15 @@
  package eu.tsystems.mms.tic.testframework.report.perf;
 
 import eu.tsystems.mms.tic.testframework.internal.TimingInfo;
+import org.testng.ITestContext;
+import org.testng.ITestResult;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
 
 public final class PerfTestContainer {
 

diff --git a/.../main/java/eu/tsystems/mms/tic/testframework/report/utils/ExecutionContextController.java b/.../main/java/eu/tsystems/mms/tic/testframework/report/utils/ExecutionContextController.java
@@ -33,17 +33,18 @@
 import eu.tsystems.mms.tic.testframework.report.model.context.SessionContext;
 import eu.tsystems.mms.tic.testframework.report.model.context.SuiteContext;
 import eu.tsystems.mms.tic.testframework.report.model.context.TestContext;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestContext;
 import org.testng.ITestNGMethod;
 import org.testng.ITestResult;
 
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 public class ExecutionContextController {
 
     private static ExecutionContext EXECUTION_CONTEXT;

diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/utils/ExecutionUtils.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/utils/ExecutionUtils.java
@@ -21,15 +21,9 @@
  */
  package eu.tsystems.mms.tic.testframework.report.utils;
 
-import eu.tsystems.mms.tic.testframework.annotations.Fails;
 import eu.tsystems.mms.tic.testframework.annotations.SupportMethod;
 import eu.tsystems.mms.tic.testframework.report.model.context.Cause;
 import eu.tsystems.mms.tic.testframework.report.model.context.StackTrace;
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtMethod;
-import javassist.LoaderClassPath;
-import javassist.NotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestContext;
@@ -38,13 +32,9 @@
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.stream.Collectors;
 
 /**
  * ExecutionUtils