chore: General refactoring and fixing minor performance issues.

browse-the-web/src/main/java/net/serenitybdd/screenplay/actions/EnterValue.java

@@ -12,8 +12,7 @@ public abstract class EnterValue implements Action {
 
     protected final String theText;
     protected final List<Keys> followedByKeys;
-    protected String followedBy;
-    private final String ENTER_KEYS_INTRO_TEXT = " then hits ";
+    private static final String ENTER_KEYS_INTRO_TEXT = " then hits ";
 
     public EnterValue(String theText) {
         this.theText = theText;
@@ -22,7 +21,6 @@ public EnterValue(String theText) {
 
     public EnterValue thenHit(Keys... keys) {
         this.followedByKeys.addAll(Lists.newArrayList(keys));
-        this.followedBy = getFollowedByKeysDescriptionFor(followedByKeys);
         return this;
     }
 

browse-the-web/src/main/java/net/serenitybdd/screenplay/actions/Hit.java

@@ -6,6 +6,8 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
 
+import java.util.Arrays;
+
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
 public class Hit {
@@ -17,7 +19,7 @@ public Hit(Keys[] keys) {
     }
 
     public static Hit the(Keys... keys) {
-        return new Hit(keys);
+        return new Hit(Arrays.copyOf(keys,keys.length));
     }
 
     public Performable into(String cssOrXpathForElement) {

browse-the-web/src/main/java/net/serenitybdd/screenplay/actions/HitBy.java

@@ -5,14 +5,16 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
 
+import java.util.Arrays;
+
 public class HitBy extends ByAction {
 
     private Keys[] keys;
     private String pluraliser;
 
     public HitBy(Keys[] keys, By... locators) {
         super(locators);
-        this.keys = keys;
+        this.keys = Arrays.copyOf(keys,keys.length);
     }
 
     @Step("{0} hits the '#keys' key#pluraliser")

browse-the-web/src/main/java/net/serenitybdd/screenplay/actions/HitElement.java

@@ -6,14 +6,16 @@
 import net.thucydides.core.annotations.Step;
 import org.openqa.selenium.Keys;
 
+import java.util.Arrays;
+
 public class HitElement implements Action {
 
     private Keys[] keys;
     private String pluraliser;
     private WebElementFacade element;
 
     public HitElement(Keys[] keys, WebElementFacade element) {
-        this.keys = keys;
+        this.keys = Arrays.copyOf(keys,keys.length);
         this.element = element;
     }
 

browse-the-web/src/main/java/net/serenitybdd/screenplay/actions/HitTarget.java

@@ -6,13 +6,15 @@
 import net.thucydides.core.annotations.Step;
 import org.openqa.selenium.Keys;
 
+import java.util.Arrays;
+
 public class HitTarget implements Action {
 
     private Keys[] keys;
     private Target target;
 
     public HitTarget(Keys[] keys, Target target) {
-        this.keys = keys;
+        this.keys = Arrays.copyOf(keys,keys.length);
         this.target = target;
     }
 

browse-the-web/src/main/java/net/serenitybdd/screenplay/questions/JavaScript.java

@@ -3,6 +3,8 @@
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.abilities.BrowseTheWeb;
 
+import java.util.Arrays;
+
 public class JavaScript extends UIState<String> {
 
     private final String expression;
@@ -11,7 +13,7 @@ public class JavaScript extends UIState<String> {
     public JavaScript(String expression, Object[] parameters, Actor actor) {
         super(actor);
         this.expression = expression;
-        this.parameters = parameters;
+        this.parameters = Arrays.copyOf(parameters,parameters.length);
     }
 
     public static JavaScriptBuilder evaluate(String expression) {

serenity-ant-task/src/main/java/net/serenitybdd/ant/SerenityReportingTask.java

@@ -41,7 +41,7 @@ public class SerenityReportingTask extends Task {
      */
     public String jiraProject;
 
-    private final String DEFAULT_SOURCE = "target/site/serenity";
+    private static final String DEFAULT_SOURCE = "target/site/serenity";
 
     private PathProcessor pathProcessor = new PathProcessor();
 

serenity-core/src/main/java/net/serenitybdd/core/annotations/locators/SmartAnnotations.java

@@ -19,10 +19,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import static io.appium.java_client.remote.MobilePlatform.ANDROID;
 import static io.appium.java_client.remote.MobilePlatform.IOS;
@@ -421,7 +418,7 @@ private static String getFilledValue(Annotation mobileBy) {
         }
         throw new IllegalArgumentException("@"
                 + mobileBy.getClass().getSimpleName() + ": one of "
-                + Strategies.strategyNames().toString() + " should be filled");
+                + Arrays.toString(Strategies.strategyNames()) + " should be filled");
     }
 
     private static Method[] prepareAnnotationMethods(

serenity-core/src/main/java/net/serenitybdd/core/pages/MatchingPageExpressions.java

@@ -2,10 +2,7 @@
 
 import net.thucydides.core.annotations.At;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Pattern;
 
 /**

serenity-core/src/main/java/net/serenitybdd/core/pages/WebElementFacadeImpl.java

@@ -487,7 +487,7 @@ public String getFoundBy() {
     }
 
 
-    class ExtractText implements Converter<WebElement, String> {
+    static class ExtractText implements Converter<WebElement, String> {
         public String convert(WebElement from) {
             return from.getText();
         }

serenity-core/src/main/java/net/serenitybdd/core/photography/DarkroomProcessingLine.java

@@ -9,9 +9,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
 
 public class DarkroomProcessingLine implements Runnable {
 
@@ -29,15 +30,17 @@ public void terminate() {
 
     }
 
-    private final Queue<ScreenshotNegative> queue;
+    private final List<ScreenshotNegative> queue;
 
     DarkroomProcessingLine(List<? extends PhotoFilter> processors) {
         this.processors = processors;
-        this.queue = new ConcurrentLinkedQueue<>();
+        this.queue = Collections.synchronizedList(new LinkedList<ScreenshotNegative>());
+//        this.queue = new ConcurrentLinkedQueue<>();
     }
 
     public ScreenshotReceipt addToProcessingQueue(ScreenshotNegative negative) {
-        queue.offer(negative);
+//        queue.offer(negative);
+        queue.add(negative);
         synchronized (queue) {
             queue.notifyAll();
         }
@@ -72,7 +75,8 @@ private void finishProcessingNegatives() {
 
     private void processNegative() {
         while (!queue.isEmpty()) {
-            ScreenshotNegative negative = queue.poll();
+            Queue q;
+            ScreenshotNegative negative = queue.get(0);
             if (negative != null) {
                 process(negative);
             }

serenity-core/src/main/java/net/serenitybdd/core/photography/ScreenshotPhoto.java

@@ -9,7 +9,7 @@
  */
 public class ScreenshotPhoto {
 
-    public static ScreenshotPhoto None = new ScreenshotPhoto(null);
+    public final static ScreenshotPhoto None = new ScreenshotPhoto(null);
 
     private final Path pathToScreenshot;
 

serenity-core/src/main/java/net/thucydides/core/ThucydidesSystemProperty.java

@@ -830,7 +830,7 @@ public int integerFrom(EnvironmentVariables environmentVariables, int defaultVal
                 = Optional.fromNullable(environmentVariables.getProperty(withSerenityPrefix(getPropertyName())));
 
         if (isDefined(newPropertyValue)) {
-            return Integer.valueOf(newPropertyValue.get());
+            return Integer.parseInt(newPropertyValue.get());
         } else {
             Optional<String> legacyValue = legacyPropertyValueIfPresentIn(environmentVariables);
             return (isDefined(legacyValue)) ? Integer.valueOf(legacyValue.get()) : defaultValue;

serenity-core/src/main/java/net/thucydides/core/annotations/Fields.java

@@ -129,7 +129,7 @@ private FieldValueProvider fieldValueFrom(Field field) {
             return new FieldValueProvider(field, object);
         }
 
-        private class FieldValueProvider {
+        private static class FieldValueProvider {
             Field field;
             Object object;
 

serenity-core/src/main/java/net/thucydides/core/bootstrap/ThucydidesContext.java

@@ -46,8 +46,6 @@ class ThucydidesContext {
 
     private String defaultDriver;
 
-    private WebDriverFactory webDriverFactory;
-
     private Pages pages;
 
     /**
@@ -67,7 +65,6 @@ private ThucydidesContext(String defaultDriver, StepListener... additionalListen
         outputDirectory = configuration.getOutputDirectory();
         this.defaultDriver = defaultDriver;
         if (defaultDriver != null) {
-            webDriverFactory = new WebDriverFactory();
             pages =  new Pages(getDriver());
             stepFactory = new StepFactory(pages);
         } else {

serenity-core/src/main/java/net/thucydides/core/matchers/BeanPropertyMatcher.java

@@ -27,8 +27,7 @@ public <T> Matcher<T> getMatcher() {
     @Override
     public String toString() {
         String matcherDescription = matcher.toString();
-        String htmlFriendlyMatcherDescription
-                = (matcherDescription != null) ? matcherDescription.replaceAll("\"", "'") : "";
+        String htmlFriendlyMatcherDescription = matcherDescription.replaceAll("\"", "'");
         return fieldName + " " + htmlFriendlyMatcherDescription;
     }
 }

serenity-core/src/main/java/net/thucydides/core/model/DataTable.java

@@ -244,7 +244,7 @@ private List<Object> rowDataFrom(Map<String, ? extends Object> mappedRow) {
 
     }
 
-    public class RowValueAccessor {
+    public static class RowValueAccessor {
         private final DataTable dataTable;
         private final int rowNumber;
 

serenity-core/src/main/java/net/thucydides/core/model/Screenshot.java

@@ -60,7 +60,7 @@ public HtmlFormattedInfo getHtml() {
         return new HtmlFormattedInfo(description);
     }
 
-    public class HtmlFormattedInfo {
+    public static class HtmlFormattedInfo {
         private final String description;
 
         public HtmlFormattedInfo(String description) {

serenity-core/src/main/java/net/thucydides/core/model/TestOutcome.java

@@ -71,7 +71,7 @@
  */
 public class TestOutcome {
 
-    private static final int RECENT_TEST_RUN_COUNT = 10;
+    private static final Integer RECENT_TEST_RUN_COUNT = 10;
     private static final String ISSUES = "issues";
     private static final String NEW_LINE = System.getProperty("line.separator");
 
@@ -2032,7 +2032,7 @@ public void causedBy(Class<? extends Throwable> expected) {
         }
     }
 
-    private class SpecificTagFinder {
+    private static class SpecificTagFinder {
         private final TestTag tag;
 
         public SpecificTagFinder(TestTag tag) {

serenity-core/src/main/java/net/thucydides/core/model/stacktrace/FailureCause.java

@@ -47,7 +47,7 @@ private static String exceptionClassName(Throwable cause) {
     public FailureCause(String errorType, String message, StackTraceElement[] stackTrace) {
         this.errorType = errorType;
         this.message = parseErrorMessage(message);
-        this.stackTrace = stackTrace;
+        this.stackTrace = Arrays.copyOf(stackTrace,stackTrace.length);
     }
 
     private String parseErrorMessage(String message) {
@@ -91,11 +91,11 @@ public String asString() {
     }
 
     public StackTraceElement[] getStackTrace() {
-        return stackTrace;
+        return Arrays.copyOf(stackTrace, stackTrace.length);
     }
 
     public void setStackTrace(StackTraceElement[] stackTrace) {
-        this.stackTrace = stackTrace;
+        this.stackTrace = Arrays.copyOf(stackTrace,stackTrace.length);
     }
 
     public Class<? extends Throwable> exceptionClass() {

serenity-core/src/main/java/net/thucydides/core/model/stacktrace/StackTraceSanitizer.java

@@ -5,6 +5,7 @@
 import net.thucydides.core.guice.Injectors;
 import net.thucydides.core.util.EnvironmentVariables;
 
+import java.util.Arrays;
 import java.util.List;
 
 import static net.thucydides.core.ThucydidesSystemProperty.SIMPLIFIED_STACK_TRACES;
@@ -50,7 +51,7 @@ public class StackTraceSanitizer {
 
     public StackTraceSanitizer(EnvironmentVariables environmentVariables, StackTraceElement[] stackTrace) {
         this.environmentVariables = environmentVariables;
-        this.stackTrace = stackTrace;
+        this.stackTrace = Arrays.copyOf(stackTrace,stackTrace.length);
     }
 
     public static StackTraceSanitizer forStackTrace(StackTraceElement[] stackTrace) {

serenity-core/src/main/java/net/thucydides/core/pages/components/HtmlTable.java

@@ -94,7 +94,7 @@ public HtmlTable inTable(WebElement table) {
         }
     }
 
-    private class EnoughCellsCheck {
+    private static class EnoughCellsCheck {
         private final int minimumNumberOfCells;
 
         private EnoughCellsCheck(List<String> headings) {

serenity-core/src/main/java/net/thucydides/core/reports/FormatConfiguration.java

@@ -17,7 +17,7 @@ public class FormatConfiguration {
 
     private final static Logger LOGGER = LoggerFactory.getLogger(FormatConfiguration.class);
 
-    public static String DEFAULT_FORMATS = "json,xml,html";
+    public final static String DEFAULT_FORMATS = "json,xml,html";
 
     private final List<OutcomeFormat> formats;
 

serenity-core/src/main/java/net/thucydides/core/reports/TestOutcomes.java

@@ -323,7 +323,7 @@ public TestOutcomes withRequirementsTags() {
         return new TestOutcomes(testOutcomesWithRequirements, estimatedAverageStepCount, label, rootOutcomes.orNull(), environmentVariables);
     }
 
-    private class TagFinder {
+    private static class TagFinder {
         private final String tagType;
 
         private TagFinder(String tagType) {
@@ -759,7 +759,7 @@ public TestOutcomeMatcher findMatchingTags() {
         return new TestOutcomeMatcher(this);
     }
 
-    public final class TestOutcomeMatcher {
+    public static final class TestOutcomeMatcher {
 
         private final TestOutcomes outcomes;
         private Optional<List<Matcher<String>>> nameMatcher = Optional.absent();

serenity-core/src/main/java/net/thucydides/core/reports/adaptors/xunit/BasicXUnitLoader.java

@@ -116,7 +116,7 @@ private Document parseDocument(File xUnitReport) throws IOException {
         }
     }
 
-    private class ExceptionElementBuilder {
+    private static class ExceptionElementBuilder {
         private final Element testCaseElement;
 
         public ExceptionElementBuilder(Element testCaseElement) {

serenity-core/src/main/java/net/thucydides/core/reports/html/Formatter.java

@@ -396,7 +396,7 @@ private List<String> sortByDecreasingSize(List<String> issues) {
         Collections.sort(sortedIssues, new Comparator<String>() {
             @Override
             public int compare(String a, String b) {
-                return new Integer(-a.length()).compareTo(new Integer(b.length()));
+                return Integer.valueOf(-a.length()).compareTo(new Integer(b.length()));
             }
         });
         return sortedIssues;