Use constructor injection

huw0 · May 4, 2020 · a4f12aa · a4f12aa
1 parent 61921ed
commit a4f12aa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/.../src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfiguration.java b/.../src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfiguration.java
@@ -9,6 +9,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -33,8 +34,8 @@ public Loader<?> pebbleLoader(PebbleProperties properties) {
 
   @Bean
   @ConditionalOnMissingBean
-  public SpringExtension pebbleSpringExtension() {
-    return new SpringExtension();
+  public SpringExtension pebbleSpringExtension(MessageSource messageSource) {
+    return new SpringExtension(messageSource);
   }
 
   @Bean

diff --git a/.../test/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfigurationTest.java b/.../test/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfigurationTest.java
@@ -13,6 +13,7 @@
 import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebApplicationContext;
 import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebApplicationContext;
+import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -101,8 +102,8 @@ public PebbleEngine pebbleEngine() {
     }
 
     @Bean
-    public SpringExtension customSpringExtension() {
-      return new SpringExtension();
+    public SpringExtension customSpringExtension(MessageSource messageSource) {
+      return new SpringExtension(messageSource);
     }
   }
 

diff --git a/...le-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/SpringExtension.java b/...le-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/SpringExtension.java
@@ -18,7 +18,6 @@
 import com.mitchellbosecke.pebble.spring.extension.function.bindingresult.HasGlobalErrorsFunction;
 import java.util.HashMap;
 import java.util.Map;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 
 /**
@@ -30,8 +29,11 @@
  */
 public class SpringExtension extends AbstractExtension {
 
-  @Autowired
-  private MessageSource messageSource;
+  private final MessageSource messageSource;
+
+  public SpringExtension(MessageSource messageSource) {
+    this.messageSource = messageSource;
+  }
 
   @Override
   public Map<String, Function> getFunctions() {

diff --git a/...ring/pebble-spring5/src/test/java/com/mitchellbosecke/pebble/spring/config/MVCConfig.java b/...ring/pebble-spring5/src/test/java/com/mitchellbosecke/pebble/spring/config/MVCConfig.java
@@ -12,7 +12,6 @@
 import com.mitchellbosecke.pebble.spring.bean.SomeBean;
 import com.mitchellbosecke.pebble.spring.extension.SpringExtension;
 import com.mitchellbosecke.pebble.spring.servlet.PebbleViewResolver;
-
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,8 +50,8 @@ public PebbleEngine pebbleEngine(SpringExtension springExtension,
   }
 
   @Bean
-  public SpringExtension springExtension() {
-    return new SpringExtension();
+  public SpringExtension springExtension(MessageSource messageSource) {
+    return new SpringExtension(messageSource);
   }
 
   @Bean