Switched to constructor injection

EmbedITCZ · Jul 12, 2019 · 899df1e · 899df1e
1 parent ce9d2e5
commit 899df1e
Show file tree

Hide file tree

Showing 23 changed files with 98 additions and 102 deletions.
diff --git a/...-support-core-test-app/src/main/java/org/jbehavesupport/core/test/app/DatabaseConfig.java b/...-support-core-test-app/src/main/java/org/jbehavesupport/core/test/app/DatabaseConfig.java
@@ -2,19 +2,19 @@
 
 import java.sql.SQLException;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.h2.tools.Server;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 
 @Slf4j
 @Configuration
+@RequiredArgsConstructor
 public class DatabaseConfig {
 
-    @Autowired
-    private Environment env;
+    private final Environment env;
 
     @Bean
     public Server initServer() {

diff --git a/...ve-support-core-test-app/src/main/java/org/jbehavesupport/core/test/app/NameEndpoint.java b/...ve-support-core-test-app/src/main/java/org/jbehavesupport/core/test/app/NameEndpoint.java
@@ -7,26 +7,26 @@
 import java.io.UncheckedIOException;
 import java.util.Arrays;
 
+import lombok.RequiredArgsConstructor;
 import org.jbehavesupport.core.test.app.oxm.Error;
 import org.jbehavesupport.core.test.app.oxm.NameRequest;
 import org.jbehavesupport.core.test.app.oxm.NameResponse;
 import org.jbehavesupport.core.test.app.oxm.ObjectFactory;
 import org.jbehavesupport.core.test.app.oxm.Relative;
 
 import org.apache.commons.io.FileUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.ws.server.endpoint.annotation.Endpoint;
 import org.springframework.ws.server.endpoint.annotation.PayloadRoot;
 import org.springframework.ws.server.endpoint.annotation.RequestPayload;
 import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
 
 @Endpoint
+@RequiredArgsConstructor
 public class NameEndpoint {
     private static final ObjectFactory OBJECT_FACTORY = new ObjectFactory();
 
-    @Autowired
-    ResourceLoader resourceLoader;
+    final ResourceLoader resourceLoader;
 
     @PayloadRoot(namespace = "http://jbehavesupport.org/definitions", localPart = "NameRequest")
     @ResponsePayload

diff --git a/...ehave-support-core-test-app/src/main/java/org/jbehavesupport/core/test/app/SshConfig.java b/...ehave-support-core-test-app/src/main/java/org/jbehavesupport/core/test/app/SshConfig.java
@@ -15,6 +15,7 @@
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
+import lombok.RequiredArgsConstructor;
 import org.crsh.plugin.CRaSHPlugin;
 import org.crsh.plugin.PluginContext;
 import org.crsh.plugin.PluginDiscovery;
@@ -24,7 +25,6 @@
 import org.crsh.vfs.spi.AbstractFSDriver;
 import org.crsh.vfs.spi.FSDriver;
 import org.springframework.beans.factory.ListableBeanFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.SpringVersion;
@@ -37,14 +37,18 @@
 import org.springframework.util.ObjectUtils;
 
 @Configuration
+@RequiredArgsConstructor
 public class SshConfig {
 
-    @Autowired
-    private Environment env;
+    private final Environment env;
+
+    private final ListableBeanFactory beanFactory;
+
+    private final ResourcePatternResolver resourceLoader;
 
     @Bean
     public CrshBootstrapBean shellBootstrap() {
-        CrshBootstrapBean bootstrapBean = new CrshBootstrapBean();
+        CrshBootstrapBean bootstrapBean = new CrshBootstrapBean(beanFactory, env, resourceLoader);
         Properties config = new Properties();
         config.put("crash.ssh.port", env.getProperty("ssh.port"));
         config.put("crash.ssh.auth_timeout", env.getProperty("ssh.timeouts.auth"));
@@ -57,16 +61,14 @@ public CrshBootstrapBean shellBootstrap() {
         return bootstrapBean;
     }
 
+    @RequiredArgsConstructor
     public static class CrshBootstrapBean extends PluginLifeCycle {
 
-        @Autowired
-        private ListableBeanFactory beanFactory;
+        private final ListableBeanFactory beanFactory;
 
-        @Autowired
-        private Environment environment;
+        private final Environment environment;
 
-        @Autowired
-        private ResourcePatternResolver resourceLoader;
+        private final ResourcePatternResolver resourceLoader;
 
         @PreDestroy
         public void destroy() {

diff --git a/jbehave-support-core/src/main/java/org/jbehavesupport/core/file/FileSteps.java b/jbehave-support-core/src/main/java/org/jbehavesupport/core/file/FileSteps.java
@@ -7,19 +7,19 @@
 import java.io.UncheckedIOException;
 import java.nio.charset.Charset;
 
+import lombok.RequiredArgsConstructor;
 import org.jbehavesupport.core.TestContext;
 
 import org.apache.commons.io.FileUtils;
 import org.jbehave.core.annotations.Given;
 import org.jbehave.core.annotations.When;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 public final class FileSteps {
 
-    @Autowired
-    private TestContext testContext;
+    private final TestContext testContext;
 
     @When("a file with the [$extension] extension is created and the file path is stored as [$alias]: $content")
     @Given("a file with the [$extension] extension is created and the file path is stored as [$alias]: $content")

diff --git a/jbehave-support-core/src/main/java/org/jbehavesupport/core/healthcheck/HealthCheckSteps.java b/jbehave-support-core/src/main/java/org/jbehavesupport/core/healthcheck/HealthCheckSteps.java
@@ -5,12 +5,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import lombok.RequiredArgsConstructor;
 import org.jbehave.core.annotations.Given;
 import org.jbehave.core.model.ExamplesTable;
 import org.jbehave.core.steps.Row;
 import org.junit.runners.model.MultipleFailureException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.stereotype.Component;
@@ -42,10 +42,10 @@
  * </pre>
  */
 @Component
+@RequiredArgsConstructor
 public final class HealthCheckSteps {
 
-    @Autowired
-    private ConfigurableListableBeanFactory beanFactory;
+    private final ConfigurableListableBeanFactory beanFactory;
 
     @Given("these components are healthy:$componentList")
     public void checkComponentsAreHealthy(ExamplesTable componentList) throws MultipleFailureException {

diff --git a/...e-support-core/src/main/java/org/jbehavesupport/core/internal/FullScenarioNameStorer.java b/...e-support-core/src/main/java/org/jbehavesupport/core/internal/FullScenarioNameStorer.java
@@ -1,26 +1,22 @@
 package org.jbehavesupport.core.internal;
 
+import lombok.RequiredArgsConstructor;
 import org.jbehavesupport.core.TestContext;
 
 import org.apache.commons.lang3.StringUtils;
 import org.jbehave.core.model.Story;
 import org.jbehave.core.reporters.NullStoryReporter;
 import org.jbehavesupport.core.AbstractSpringStories;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 public class FullScenarioNameStorer extends NullStoryReporter {
 
     private static final ThreadLocal<String> CURRENT_STORY = new ThreadLocal<>();
 
     private final TestContext testContext;
 
-    @Autowired
-    public FullScenarioNameStorer(TestContext testContext) {
-        this.testContext = testContext;
-    }
-
     @Override
     public void beforeStory(Story story, boolean givenStory) {
         if (!givenStory) {

diff --git a/...rg/jbehavesupport/core/internal/parameterconverters/ExamplesEvaluationTableConverter.java b/...rg/jbehavesupport/core/internal/parameterconverters/ExamplesEvaluationTableConverter.java
@@ -5,22 +5,22 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import lombok.RequiredArgsConstructor;
 import org.jbehavesupport.core.expression.ExpressionEvaluator;
 
 import org.jbehave.core.configuration.Configuration;
 import org.jbehave.core.model.ExamplesTable;
 import org.jbehave.core.model.ExamplesTableFactory;
 import org.jbehave.core.steps.ParameterConverters;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 public class ExamplesEvaluationTableConverter implements ParameterConverters.ParameterConverter {
 
-    private ExamplesTableFactory factory;
+    private final ExpressionEvaluator expressionEvaluator;
 
-    @Autowired
-    private ExpressionEvaluator expressionEvaluator;
+    private ExamplesTableFactory factory;
 
     public void setConfiguration(Configuration config) {
         this.factory = new ExamplesTableFactory(config);

diff --git a/...avesupport/core/internal/parameterconverters/ExpressionEvaluatingParameterConverters.java b/...avesupport/core/internal/parameterconverters/ExpressionEvaluatingParameterConverters.java
@@ -6,6 +6,7 @@
 
 import javax.annotation.PostConstruct;
 
+import lombok.RequiredArgsConstructor;
 import org.jbehavesupport.core.expression.ExpressionEvaluatingParameter;
 import org.jbehavesupport.core.expression.ExpressionEvaluator;
 
@@ -14,10 +15,10 @@
 import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 public final class ExpressionEvaluatingParameterConverters extends ParameterConverters {
 
-    @Autowired
-    private ExpressionEvaluator expressionEvaluator;
+    private final ExpressionEvaluator expressionEvaluator;
 
     @Autowired(required = false)
     private List<ParameterConverter> converters;

diff --git a/...core/src/main/java/org/jbehavesupport/core/internal/verification/GreaterThanVerifier.java b/...core/src/main/java/org/jbehavesupport/core/internal/verification/GreaterThanVerifier.java
@@ -4,15 +4,15 @@
 import static org.springframework.util.Assert.isInstanceOf;
 import static org.springframework.util.Assert.isTrue;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 public final class GreaterThanVerifier extends AbstractVerifier {
 
-    @Autowired
-    ConversionService conversionService;
+    final ConversionService conversionService;
 
     @Override
     public String name() {

diff --git a/...t-core/src/main/java/org/jbehavesupport/core/internal/verification/LowerThanVerifier.java b/...t-core/src/main/java/org/jbehavesupport/core/internal/verification/LowerThanVerifier.java
@@ -4,15 +4,15 @@
 import static org.springframework.util.Assert.isInstanceOf;
 import static org.springframework.util.Assert.isTrue;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 public final class LowerThanVerifier extends AbstractVerifier {
 
-    @Autowired
-    ConversionService conversionService;
+    final ConversionService conversionService;
 
     @Override
     public String name() {

diff --git a/...-core/src/main/java/org/jbehavesupport/core/internal/web/WebElementRegistryPopulator.java b/...-core/src/main/java/org/jbehavesupport/core/internal/web/WebElementRegistryPopulator.java
@@ -7,6 +7,7 @@
 
 import javax.annotation.PostConstruct;
 
+import lombok.RequiredArgsConstructor;
 import org.jbehavesupport.core.web.WebSetting;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,14 +16,13 @@
 import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 public class WebElementRegistryPopulator {
 
     private static final String YAML_EXTENSION = ".yaml";
 
-    @Autowired
-    private ResourcePatternResolver resourcePatternResolver;
-    @Autowired
-    private YamlElementLocatorParser yamlElementLocatorParser;
+    private final ResourcePatternResolver resourcePatternResolver;
+    private final YamlElementLocatorParser yamlElementLocatorParser;
     @Autowired(required = false)
     private List<WebSetting> settings;
 

diff --git a/...in/java/org/jbehavesupport/core/report/extension/EnvironmentInfoXmlReporterExtension.java b/...in/java/org/jbehavesupport/core/report/extension/EnvironmentInfoXmlReporterExtension.java
@@ -4,22 +4,22 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import lombok.RequiredArgsConstructor;
 import org.jbehavesupport.core.report.ReportContext;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;
 
+@RequiredArgsConstructor
 public class EnvironmentInfoXmlReporterExtension extends AbstractXmlReporterExtension {
 
     private static final String ENVIRONMENT_INFO_XML_REPORTER_EXTENSION = "environmentInfo";
     private static final String ENVIRONMENT_INFO_BEGINNING = "environmentInfo.";
     private static final String KEY_VALUE_TAG = "<values><key>%s</key><value><![CDATA[%s]]></value></values>";
 
-    @Autowired
-    private Environment environment;
+    private final Environment environment;
 
     @Override
     public String getName() {

diff --git a/.../main/java/org/jbehavesupport/core/report/extension/FailScreenshotsReporterExtension.java b/.../main/java/org/jbehavesupport/core/report/extension/FailScreenshotsReporterExtension.java
@@ -3,20 +3,20 @@
 import java.io.Writer;
 import java.util.Set;
 
+import lombok.RequiredArgsConstructor;
 import org.jbehavesupport.core.TestContext;
 import org.jbehavesupport.core.report.ReportContext;
 import org.jbehavesupport.core.report.ReportRenderingPhase;
 
 import org.jbehavesupport.core.internal.web.WebScreenshotCreator;
-import org.springframework.beans.factory.annotation.Autowired;
 
+@RequiredArgsConstructor
 public class FailScreenshotsReporterExtension extends AbstractXmlReporterExtension {
 
     private static final String FAIL_SCREENSHOTS_REPORTER_EXTENSION = "errorScreenshots";
     private static final String SCREENSHOT_TAG = "<screenshot>%s</screenshot>";
 
-    @Autowired
-    private TestContext testContext;
+    private final TestContext testContext;
 
     @Override
     public String getName() {

diff --git a/...core/src/main/java/org/jbehavesupport/core/report/extension/RestXmlReporterExtension.java b/...core/src/main/java/org/jbehavesupport/core/report/extension/RestXmlReporterExtension.java
@@ -16,11 +16,11 @@
 import java.util.Map;
 import java.util.Set;
 
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.io.IOUtils;
 import org.jbehavesupport.core.AbstractSpringStories;
 import org.jbehavesupport.core.TestContext;
 import org.jbehavesupport.core.report.ReportContext;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;
@@ -30,13 +30,13 @@
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.util.MimeType;
 
+@RequiredArgsConstructor
 public class RestXmlReporterExtension extends AbstractXmlReporterExtension implements ClientHttpRequestInterceptor {
 
     @Value("${rest.directory:./target/reports}")
     private String restDirectory;
 
-    @Autowired
-    private TestContext testContext;
+    private final TestContext testContext;
 
     private static final String REST_XML_REPORTER_EXTENSION = "rest";
     private static final String REQUEST_RESPONSE_TAG = "requestResponse";