Merge pull request #9 from mariazevedo88/fix/bestPractices

Fixing all Autowired fields.

src/main/java/io/github/mariazevedo88/financialjavaapi/controller/v1/statistic/StatisticController.java

@@ -36,12 +36,18 @@
 @RequestMapping("/financial/v1/statistics")
 public class StatisticController {
 
-	@Autowired
-	private StatisticService service;
+	private StatisticService statisticService;
 
-	@Autowired
 	private TransactionService transactionService;
 
+	@Autowired
+	public StatisticController(StatisticService statisticService, 
+			TransactionService transactionService) {
+
+		this.statisticService = statisticService;
+		this.transactionService = transactionService;
+	}
+
 	/**
 	 * Method that creates statistics based on the transactions.
 	 * 
@@ -69,7 +75,7 @@ public ResponseEntity<Response<StatisticDTO>> create(@RequestHeader(value=Financ
 		Response<StatisticDTO> response = new Response<>();
 
 		Statistic statistics = createStatistics(transactionService.findAll());
-		statistics = service.save(statistics);
+		statistics = statisticService.save(statistics);
 
 		StatisticDTO dto = convertEntityToDTO(statistics);
 		createSelfLink(statistics, dto);

src/main/java/io/github/mariazevedo88/financialjavaapi/controller/v1/transaction/TransactionController.java

@@ -52,8 +52,12 @@ public class TransactionController {
 
 	private static final Logger logger = LoggerFactory.getLogger(TransactionController.class);
 
+	private TransactionService transactionService;
+
 	@Autowired
-	private TransactionService service;
+	public TransactionController(TransactionService transactionService) {
+		this.transactionService = transactionService;
+	}
 
 	/**
 	 * Method that creates a transaction in the database.
@@ -100,7 +104,7 @@ public ResponseEntity<Response<TransactionDTO>> create(@RequestHeader(value=Fina
 			throw new NotParsableContentException("Date of the transaction is in the future.");
 		}
 
-		Transaction transaction = service.save(convertDTOToEntity(dto));
+		Transaction transaction = transactionService.save(convertDTOToEntity(dto));
 		TransactionDTO dtoSaved = convertEntityToDTO(transaction);
 		createSelfLink(transaction, dtoSaved);
 
@@ -159,14 +163,14 @@ public ResponseEntity<Response<TransactionDTO>> update(@RequestHeader(value=Fina
 			throw new NotParsableContentException("Date of the transaction is in the future.");
 		}
 
-		Optional<Transaction> transactionToFind = service.findById(dto.getId());
+		Optional<Transaction> transactionToFind = transactionService.findById(dto.getId());
 		if (!transactionToFind.isPresent()) {
 			throw new TransactionNotFoundException("Transaction id=" + dto.getId() + " not found");
 		} else if (transactionToFind.get().getId().compareTo(dto.getId()) != 0) {
 			throw new TransactionInvalidUpdateException("You don't have permission to change the transaction id=" + dto.getId());
 		}
 
-		Transaction transaction = service.save(convertDTOToEntity(dto));
+		Transaction transaction = transactionService.save(convertDTOToEntity(dto));
 		TransactionDTO itemDTO = convertEntityToDTO(transaction);
 
 		createSelfLink(transaction, itemDTO);
@@ -203,7 +207,7 @@ public ResponseEntity<Response<List<TransactionDTO>>> findAll(@RequestHeader(val
 
 		Response<List<TransactionDTO>> response = new Response<>();
 
-		List<Transaction> transactions = service.findAll();
+		List<Transaction> transactions = transactionService.findAll();
 
 		if (transactions.isEmpty()) {
 			throw new TransactionNotFoundException("There are no transactions registered in the database.");
@@ -257,7 +261,7 @@ public ResponseEntity<Response<List<TransactionDTO>>> findByNsu(@RequestHeader(v
 		throws TransactionNotFoundException {
 
 		Response<List<TransactionDTO>> response = new Response<>();
-		List<Transaction> transactions = service.findByNsu(transactionNSU);
+		List<Transaction> transactions = transactionService.findByNsu(transactionNSU);
 
 		if (transactions.isEmpty()) {
 			throw new TransactionNotFoundException("There are no transactions registered with the nsu=" + transactionNSU);
@@ -308,7 +312,7 @@ public ResponseEntity<Response<TransactionDTO>> findById(@RequestHeader(value=Fi
 		throws TransactionNotFoundException {
 
 		Response<TransactionDTO> response = new Response<>();
-		Optional<Transaction> transaction = service.findById(transactionId);
+		Optional<Transaction> transaction = transactionService.findById(transactionId);
 
 		if (!transaction.isPresent()) {
 			throw new TransactionNotFoundException("Transaction id=" + transactionId + " not found");
@@ -352,13 +356,13 @@ public ResponseEntity<Response<String>> delete(@RequestHeader(value=FinancialApi
 		throws TransactionNotFoundException {
 
 		Response<String> response = new Response<>();
-		Optional<Transaction> transaction = service.findById(transactionId);
+		Optional<Transaction> transaction = transactionService.findById(transactionId);
 
 		if (!transaction.isPresent()) {
 			throw new TransactionNotFoundException("Transaction id=" + transactionId + " not found");
 		}
 
-		service.deleteById(transactionId);
+		transactionService.deleteById(transactionId);
 		response.setData("Transaction id=" + transactionId + " successfully deleted");
 
 		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();

src/main/java/io/github/mariazevedo88/financialjavaapi/service/statistic/impl/StatisticServiceImpl.java

@@ -16,12 +16,16 @@
  * @author Mariana Azevedo
  * @since 28/03/2020
  */
-@Service
+@Service("statisticService")
 public class StatisticServiceImpl implements StatisticService {
 
-	@Autowired
 	private StatisticRepository statisticRepository;
 
+	@Autowired
+	public StatisticServiceImpl(StatisticRepository statisticRepository) {
+		this.statisticRepository = statisticRepository;
+	}
+
 	/**
 	 * @see StatisticService#save(Statistic)
 	 */

src/main/java/io/github/mariazevedo88/financialjavaapi/service/transaction/impl/TransactionServiceImpl.java

@@ -20,15 +20,19 @@
 @Service
 public class TransactionServiceImpl implements TransactionService {
 
+	private TransactionRepository transactionRepository;
+
 	@Autowired
-	private TransactionRepository repository;
+	public TransactionServiceImpl(TransactionRepository transactionRepository) {
+		this.transactionRepository = transactionRepository;
+	}
 
 	/**
 	 * @see TransactionService#save(Transaction)
 	 */
 	@Override
 	public Transaction save(Transaction transaction) {
-		return repository.save(transaction);
+		return transactionRepository.save(transaction);
 	}
 
 	/**
@@ -37,15 +41,15 @@ public Transaction save(Transaction transaction) {
 	@Override
 	@Cacheable(value="transactionNsuCache", key="#nsu", unless="#result==null")
 	public List<Transaction> findByNsu(String nsu) {
-		return repository.findByNsu(nsu);
+		return transactionRepository.findByNsu(nsu);
 	}
 
 	/**
 	 * @see TransactionService#deleteById(Long)
 	 */
 	@Override
 	public void deleteById(Long transactionId) {
-		repository.deleteById(transactionId);		
+		transactionRepository.deleteById(transactionId);		
 	}
 
 	/**
@@ -54,15 +58,15 @@ public void deleteById(Long transactionId) {
 	@Override
 	@Cacheable(value="transactionIdCache", key="#id", unless="#result==null")
 	public Optional<Transaction> findById(Long id) {
-		return repository.findById(id);
+		return transactionRepository.findById(id);
 	}
 
 	/**
 	 * @see TransactionService#findAll()
 	 */
 	@Override
 	public List<Transaction> findAll() {
-		return repository.findAll();
+		return transactionRepository.findAll();
 	}
 
 }

src/main/java/io/github/mariazevedo88/financialjavaapi/util/config/FinancialApiConfiguration.java

@@ -27,7 +27,7 @@ public class FinancialApiConfiguration {
 	 * 
 	 * @return <code>LinkDiscoverers</code> object
 	 */
-	@Bean
+	@Bean(name = "linkDiscover")
     public LinkDiscoverers discoverers() {
         List<LinkDiscoverer> plugins = new ArrayList<>();
         plugins.add(new CollectionJsonLinkDiscoverer());

src/main/java/io/github/mariazevedo88/financialjavaapi/util/config/RateLimitingConfiguration.java

@@ -16,9 +16,13 @@
 @Configuration
 public class RateLimitingConfiguration implements WebMvcConfigurer {
 
-	@Autowired
 	private RateLimitInterceptor interceptor;
 
+	@Autowired
+	public RateLimitingConfiguration(RateLimitInterceptor interceptor) {
+		this.interceptor = interceptor;
+	}
+
 	/**
 	 * Method that allow intercepting routes for rate limiting
 	 * 

src/main/java/io/github/mariazevedo88/financialjavaapi/util/interceptor/RateLimitInterceptor.java

@@ -23,8 +23,12 @@
 @Component
 public class RateLimitInterceptor implements HandlerInterceptor {
 
-    @Autowired
     private APIUsagePlansService pricingPlanService;
+
+    @Autowired
+    public RateLimitInterceptor(APIUsagePlansService pricingPlanService) {
+    	this.pricingPlanService = pricingPlanService;
+	}
 
     /**
      * @see HandlerInterceptor#preHandle(HttpServletRequest, HttpServletResponse, Object)