constructor based dependency injection

borysn · borysn · commit 31244c2d2767 · 2016-09-07T17:40:34.000-05:00
diff --git a/src/main/java/io/abnd/rvep/config/auth/FirebaseConfig.java b/src/main/java/io/abnd/rvep/config/auth/FirebaseConfig.java
@@ -1,6 +1,5 @@
 package io.abnd.rvep.config.auth;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
@@ -12,9 +11,13 @@
 
 @Component
 public class FirebaseConfig {
-    @Autowired
+
     private FirebaseProperties fbProps;
 
+    public FirebaseConfig(FirebaseProperties fbProps) {
+        this.fbProps = fbProps;
+    }
+
     @PostConstruct
     public void init() throws FileNotFoundException {
         // init firebase
diff --git a/src/main/java/io/abnd/rvep/config/data/PersistenceConfig.java b/src/main/java/io/abnd/rvep/config/data/PersistenceConfig.java
diff --git a/src/main/java/io/abnd/rvep/config/web/CorsFilterRegistration.java b/src/main/java/io/abnd/rvep/config/web/CorsFilterRegistration.java
@@ -1,7 +1,6 @@
 package io.abnd.rvep.config.web;
 
 import io.abnd.rvep.config.properties.CorsProperties;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -12,9 +11,12 @@
 @Configuration
 public class CorsFilterRegistration {
 
-    @Autowired
     private CorsProperties corsProperties;
 
+    public CorsFilterRegistration(CorsProperties corsProperties) {
+        this.corsProperties = corsProperties;
+    }
+
     @Bean
     public FilterRegistrationBean corsFilter() {
         // setup origin url
diff --git a/src/main/java/io/abnd/rvep/security/rest/AuthProviderController.java b/src/main/java/io/abnd/rvep/security/rest/AuthProviderController.java
@@ -2,7 +2,6 @@
 
 import io.abnd.rvep.security.model.AuthProvider;
 import io.abnd.rvep.security.service.intf.AuthProviderService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,14 +14,17 @@
 @RequestMapping("/api/auth/provider")
 public class AuthProviderController {
 
-    @Autowired
     private AuthProviderService authProviderService;
 
+    public AuthProviderController(AuthProviderService authProviderService) {
+        this.authProviderService = authProviderService;
+    }
+
     @ResponseBody
     @RequestMapping(path="/get/providers",
                     produces = "application/json")
     public ResponseEntity<List<AuthProvider>> getAuthProviders() {
-        return new ResponseEntity(authProviderService
+        return new ResponseEntity<>(authProviderService
                 .getAuthProviders(), HttpStatus.OK);
     }
 
diff --git a/src/main/java/io/abnd/rvep/security/rest/FirebaseAuthController.java b/src/main/java/io/abnd/rvep/security/rest/FirebaseAuthController.java
@@ -5,7 +5,6 @@
 import io.abnd.rvep.security.model.intf.AuthVerificationResponse;
 import io.abnd.rvep.security.service.impl.FirebaseAuthVerifier;
 import io.abnd.rvep.security.service.impl.RvepJwtGenerator;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -17,11 +16,15 @@
 @RequestMapping("/api/auth/firebase")
 public class FirebaseAuthController {
 
-    @Autowired
     private FirebaseAuthVerifier fbAuthVerifier;
-    @Autowired
     private RvepJwtGenerator jwtGenerator;
 
+    public FirebaseAuthController(FirebaseAuthVerifier fbAuthVerifier,
+                                  RvepJwtGenerator jwtGenerator) {
+        this.fbAuthVerifier = fbAuthVerifier;
+        this.jwtGenerator = jwtGenerator;
+    }
+
     @ResponseBody
     @RequestMapping(value="/verify",
                     method=RequestMethod.POST,
diff --git a/src/main/java/io/abnd/rvep/security/rest/TestController.java b/src/main/java/io/abnd/rvep/security/rest/TestController.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,9 +16,12 @@
 @RestController
 @RequestMapping("/api/test")
 public class TestController {
-	
-	@Autowired
+
 	private ServiceTest serviceTest;
+
+	public TestController(ServiceTest serviceTest) {
+		this.serviceTest = serviceTest;
+	}
 	
 	@RequestMapping(value="/get/roles", method=RequestMethod.GET, produces="application/json")
 	public String testGetRoles() {
diff --git a/src/main/java/io/abnd/rvep/security/service/impl/RvepAuthProviderService.java b/src/main/java/io/abnd/rvep/security/service/impl/RvepAuthProviderService.java
@@ -3,16 +3,19 @@
 import io.abnd.rvep.security.dao.intf.AuthProviderDAO;
 import io.abnd.rvep.security.model.AuthProvider;
 import io.abnd.rvep.security.service.intf.AuthProviderService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 @Service
 public class RvepAuthProviderService implements AuthProviderService {
-    @Autowired
+
     private AuthProviderDAO authProviderDAO;
 
+    public RvepAuthProviderService(AuthProviderDAO authProviderDAO) {
+        this.authProviderDAO = authProviderDAO;
+    }
+
     @Override
     public List<AuthProvider> getAuthProviders() {
         return authProviderDAO.findAll();
diff --git a/src/main/java/io/abnd/rvep/security/service/impl/RvepJwtGenerator.java b/src/main/java/io/abnd/rvep/security/service/impl/RvepJwtGenerator.java
@@ -8,18 +8,22 @@
 import io.abnd.rvep.user.model.RvepUser;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
 
 @Service
 public class RvepJwtGenerator implements JwtGenerator {
-    @Autowired
+
     private RvepUserRoleDAO rvepUserRoleDAO;
-    @Autowired
     private RvepUserProfileDAO rvepUserProfileDAO;
 
+    public RvepJwtGenerator(RvepUserRoleDAO rvepUserRoleDAO,
+                            RvepUserProfileDAO rvepUserProfileDAO) {
+        this.rvepUserProfileDAO = rvepUserProfileDAO;
+        this.rvepUserRoleDAO = rvepUserRoleDAO;
+    }
+
     @Override
     public String generateIdToken(String email, String provider, String firebaseIdToken) {
         // get user
diff --git a/src/main/java/io/abnd/rvep/security/service/impl/ServiceTestImpl.java b/src/main/java/io/abnd/rvep/security/service/impl/ServiceTestImpl.java
@@ -7,7 +7,6 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import io.abnd.rvep.security.dao.intf.RoleCategoryDAO;
@@ -17,16 +16,19 @@
 
 @Service
 public class ServiceTestImpl implements ServiceTest {
-	
-	@Autowired
+
 	private RoleCategoryDAO roleCategoryDAO;
+
+	public ServiceTestImpl(RoleCategoryDAO roleCategoryDAO) {
+		this.roleCategoryDAO = roleCategoryDAO;
+	}
 	
 	@PersistenceContext
 	private EntityManager em;
 	
 	public List<RvepRole> testGetRoles() {
 		Query query = em.createNativeQuery("SELECT * from rvep_role", RvepRole.class);
-		List<RvepRole> result = new ArrayList<RvepRole>();
+		List<RvepRole> result = new ArrayList<>();
 		for (Object o : query.getResultList()) {
 			result.add((RvepRole)o);
 		}
diff --git a/src/main/java/io/abnd/rvep/user/rest/UserRegistrationController.java b/src/main/java/io/abnd/rvep/user/rest/UserRegistrationController.java
@@ -5,7 +5,6 @@
 import io.abnd.rvep.user.model.impl.RvepUserRegistrationRequest;
 import io.abnd.rvep.user.model.impl.RvepUserRegistrationResponse;
 import io.abnd.rvep.user.service.impl.RvepRegisterUserService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -17,13 +16,18 @@
 @RequestMapping("/api/registration")
 public class UserRegistrationController {
 
-    @Autowired
     private RvepRegisterUserService rvepRegisterUserService;
-    @Autowired
     private FirebaseAuthVerifier fbAuthVerifier;
-    @Autowired
     private RvepJwtGenerator jwtGenerator;
 
+    public UserRegistrationController(RvepRegisterUserService rvepRegisterUserService,
+                                      FirebaseAuthVerifier fbAuthVerifier,
+                                      RvepJwtGenerator jwtGenerator) {
+        this.rvepRegisterUserService = rvepRegisterUserService;
+        this.fbAuthVerifier = fbAuthVerifier;
+        this.jwtGenerator = jwtGenerator;
+    }
+
     @ResponseBody
     @RequestMapping(value="/register/user",
                     method=RequestMethod.POST,
diff --git a/src/main/java/io/abnd/rvep/user/service/impl/RvepRegisterUserService.java b/src/main/java/io/abnd/rvep/user/service/impl/RvepRegisterUserService.java
@@ -13,27 +13,34 @@
 import io.abnd.rvep.user.model.RvepUser;
 import io.abnd.rvep.user.model.RvepUserProfile;
 import io.abnd.rvep.user.service.intf.RegisterUserService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.Calendar;
 
 @Service
 public class RvepRegisterUserService implements RegisterUserService {
 
-    @Autowired
     private RvepUserProfileDAO rvepUserProfileDAO;
-    @Autowired
     private AuthProviderDAO authProviderDAO;
-    @Autowired
     private RvepUserDAO rvepUserDAO;
-    @Autowired
     private RvepUserAuthProviderDAO rvepUserAuthProviderDAO;
-    @Autowired
     private RvepRoleDAO rvepRoleDAO;
-    @Autowired
     private RvepUserRoleDAO rvepUserRoleDAO;
 
+    public RvepRegisterUserService(RvepUserProfileDAO rvepUserProfileDAO,
+                                   AuthProviderDAO authProviderDAO,
+                                   RvepUserDAO rvepUserDAO,
+                                   RvepUserAuthProviderDAO rvepUserAuthProviderDAO,
+                                   RvepRoleDAO rvepRoleDAO,
+                                   RvepUserRoleDAO rvepUserRoleDAO) {
+        this.rvepUserProfileDAO = rvepUserProfileDAO;
+        this.authProviderDAO = authProviderDAO;
+        this.rvepUserDAO = rvepUserDAO;
+        this.rvepUserAuthProviderDAO = rvepUserAuthProviderDAO;
+        this.rvepRoleDAO = rvepRoleDAO;
+        this.rvepUserRoleDAO = rvepUserRoleDAO;
+    }
+
     @Override
     public boolean isUserRegistered(String email) {
         RvepUserProfile rvepUserProfile = rvepUserProfileDAO.findByEmail(email);
diff --git a/src/test/java/io/abnd/rvep/security/rest/TestControllerTest.java b/src/test/java/io/abnd/rvep/security/rest/TestControllerTest.java
@@ -31,14 +31,15 @@ public class TestControllerTest {
 
 	@Autowired
 	private ServiceTest serviceTest;
-
 	@Autowired
 	private WebApplicationContext webAppContext;
 
 	private MockMvc mockMvc;
 
-	private List<RvepRole> roleList = new ArrayList<RvepRole>();
-	private List<RoleCategory> roleCategoryList = new ArrayList<RoleCategory>();
+	private List<RvepRole> roleList = new ArrayList<>();
+	private List<RoleCategory> roleCategoryList = new ArrayList<>();
+
+	public TestControllerTest() {}
 
 	@Before
 	public void setup() throws Exception {
