Replace usage of @Inject annotation to @Autowired.

I don't see any benefits of using @Inject and having one more dependency.

Fix #233

No functional changes.

Author: php-coder

pom.xml

@@ -27,7 +27,6 @@
 		<subethasmtp.version>3.1.7</subethasmtp.version>
 		<aspectj.version>1.8.5</aspectj.version>
 		<javax.validation.version>1.1.0.Final</javax.validation.version>
-		<javax.inject.version>1</javax.inject.version>
 		<javax.persistence.version>1.0.0.Final</javax.persistence.version>
 		<servlet.api.version>3.0.20100224</servlet.api.version>
 		<commons.lang.version>3.3.2</commons.lang.version>
@@ -197,13 +196,6 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- @Inject -->
-		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-			<version>${javax.inject.version}</version>
-		</dependency>
-		
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>

src/main/config/pmd.xml

@@ -111,35 +111,4 @@
 	</rule>
 	<rule ref="rulesets/java/clone.xml" />
 
-	
-	<rule
-		name="SpringAutowiredUsage"
-		message="Use @Inject over @Autowired for dependency injection"
-		class="net.sourceforge.pmd.lang.rule.XPathRule"
-		language="java">
-		
-		<description>
-			Use @Inject annotation from javax.inject which is standartized (belongs to JSR-303) analogue of Spring-specific @Autowired.
-		</description>
-		
-		<properties>
-			<property name="xpath">
-				<value>
-<![CDATA[
-//ClassOrInterfaceBodyDeclaration/Annotation/*/Name[@Image="Autowired"]
-]]>
-				</value>
-			</property>
-		</properties>
-		<priority>4</priority>
-		<example>
-<![CDATA[
-public class UserService {
-    @Autowired
-    private UserDao userDao;
-}
-]]>
-		</example>
-	</rule>
-	
 </ruleset>

src/main/java/ru/mystamps/web/config/ControllersConfig.java

@@ -17,8 +17,7 @@
  */
 package ru.mystamps.web.config;
 
-import javax.inject.Inject;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -29,10 +28,10 @@
 @Configuration
 public class ControllersConfig {
 
-	@Inject
+	@Autowired
 	private ServicesConfig servicesConfig;
 
-	@Inject
+	@Autowired
 	private MessageSource messageSource;
 
 	@Bean

src/main/java/ru/mystamps/web/config/DaoConfig.java

@@ -17,8 +17,7 @@
  */
 package ru.mystamps.web.config;
 
-import javax.inject.Inject;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -41,7 +40,7 @@
 @Configuration
 public class DaoConfig {
 
-	@Inject
+	@Autowired
 	private NamedParameterJdbcTemplate jdbcTemplate;
 
 	@Bean

src/main/java/ru/mystamps/web/config/MvcConfig.java

@@ -17,11 +17,10 @@
  */
 package ru.mystamps.web.config;
 
-import javax.inject.Inject;
-
 import java.util.List;
 import java.util.Locale;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -116,7 +115,7 @@ public LocaleResolver getLocaleResolver() {
 	}
 
 	@Bean
-	@Inject
+	@Autowired
 	public DomainClassConverter<?> getDomainClassConverter(FormattingConversionService service) {
 		return new DomainClassConverter<FormattingConversionService>(service);
 	}

src/main/java/ru/mystamps/web/config/ServicesConfig.java

@@ -17,8 +17,7 @@
  */
 package ru.mystamps.web.config;
 
-import javax.inject.Inject;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -35,34 +34,34 @@
 @EnableAsync
 public class ServicesConfig {
 
-	@Inject
+	@Autowired
 	private DaoConfig daoConfig;
 
-	@Inject
+	@Autowired
 	private SecurityConfig securityConfig;
 
-	@Inject
+	@Autowired
 	private SeriesDao seriesDao;
 
-	@Inject
+	@Autowired
 	private UserDao userDao;
 
-	@Inject
+	@Autowired
 	private UsersActivationDao usersActivationDao;
 
-	@Inject
+	@Autowired
 	private StrategiesConfig strategiesConfig;
 
-	@Inject
+	@Autowired
 	private ImageDao imageDao;
 
-	@Inject
+	@Autowired
 	private JavaMailSender mailSender;
 
-	@Inject
+	@Autowired
 	private Environment env;
 
-	@Inject
+	@Autowired
 	private MessageSource messageSource;
 
 	@Bean

src/main/java/ru/mystamps/web/config/StrategiesConfig.java

@@ -17,8 +17,7 @@
  */
 package ru.mystamps.web.config;
 
-import javax.inject.Inject;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
@@ -37,7 +36,7 @@ public interface StrategiesConfig {
 	@Profile("test")
 	class TestStrategiesConfig implements StrategiesConfig {
 
-		@Inject
+		@Autowired
 		private ImageDataDao imageDataDao;
 
 		@Bean
@@ -51,7 +50,7 @@ public ImagePersistenceStrategy getImagePersistenceStrategy() {
 	@Profile("prod")
 	class ProdStrategiesConfig implements StrategiesConfig {
 
-		@Inject
+		@Autowired
 		private Environment env;
 
 		@Bean

src/main/java/ru/mystamps/web/support/spring/security/AuthenticationFailureListener.java

@@ -19,12 +19,12 @@
 
 import java.util.Date;
 
-import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.security.authentication.event.AuthenticationFailureBadCredentialsEvent;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -37,7 +37,7 @@ public class AuthenticationFailureListener
 
 	private static final Logger LOG = LoggerFactory.getLogger(AuthenticationFailureListener.class);
 
-	@Inject
+	@Autowired
 	private SiteService siteService;
 
 	@Override

src/main/java/ru/mystamps/web/support/spring/security/SecurityConfig.java

@@ -17,9 +17,9 @@
  */
 package ru.mystamps.web.support.spring.security;
 
-import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.ApplicationListener;
 import org.springframework.http.HttpMethod;
@@ -48,10 +48,10 @@
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
-	@Inject
+	@Autowired
 	private MessageSource messageSource;
 
-	@Inject
+	@Autowired
 	private ServicesConfig servicesConfig;
 
 	@Override
@@ -105,7 +105,7 @@ protected void configure(HttpSecurity http) throws Exception {
 				.disable();
 	}
 
-	@Inject
+	@Autowired
 	@Override
 	protected void configure(AuthenticationManagerBuilder auth) {
 		auth.authenticationProvider(getAuthenticationProvider());

src/main/java/ru/mystamps/web/support/togglz/TogglzConfig.java

@@ -19,9 +19,9 @@
 
 import java.util.Collections;
 
-import javax.inject.Inject;
 import javax.sql.DataSource;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.embedded.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -39,7 +39,7 @@
 @Configuration
 public class TogglzConfig {
 
-	@Inject
+	@Autowired
 	private DataSource dataSource;
 
 	@Bean

src/main/java/ru/mystamps/web/validation/jsr303/ExistingActivationKeyValidator.java

@@ -17,16 +17,17 @@
  */
 package ru.mystamps.web.validation.jsr303;
 
-import javax.inject.Inject;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
+import org.springframework.beans.factory.annotation.Autowired;
+
 import ru.mystamps.web.service.UsersActivationService;
 
 public class ExistingActivationKeyValidator
 	implements ConstraintValidator<ExistingActivationKey, String> {
 
-	@Inject
+	@Autowired
 	private UsersActivationService usersActivationService;
 
 	@Override

src/main/java/ru/mystamps/web/validation/jsr303/UniqueCategoryNameValidator.java

@@ -17,17 +17,18 @@
  */
 package ru.mystamps.web.validation.jsr303;
 
-import javax.inject.Inject;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
+import org.springframework.beans.factory.annotation.Autowired;
+
 import ru.mystamps.web.service.CategoryService;
 import ru.mystamps.web.validation.jsr303.UniqueCategoryName.Lang;
 
 public class UniqueCategoryNameValidator
 	implements ConstraintValidator<UniqueCategoryName, String> {
 
-	@Inject
+	@Autowired
 	private CategoryService categoryService;
 
 	private Lang lang;

src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountryNameValidator.java

@@ -17,16 +17,17 @@
  */
 package ru.mystamps.web.validation.jsr303;
 
-import javax.inject.Inject;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
+import org.springframework.beans.factory.annotation.Autowired;
+
 import ru.mystamps.web.service.CountryService;
 import ru.mystamps.web.validation.jsr303.UniqueCountryName.Lang;
 
 public class UniqueCountryNameValidator implements ConstraintValidator<UniqueCountryName, String> {
 
-	@Inject
+	@Autowired
 	private CountryService countryService;
 
 	private Lang lang;

src/main/java/ru/mystamps/web/validation/jsr303/UniqueGibbonsNumbersValidator.java

@@ -19,18 +19,19 @@
 
 import java.util.Set;
 
-import javax.inject.Inject;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
+import org.springframework.beans.factory.annotation.Autowired;
+
 import ru.mystamps.web.entity.GibbonsCatalog;
 import ru.mystamps.web.service.SeriesService;
 import ru.mystamps.web.util.CatalogUtils;
 
 public class UniqueGibbonsNumbersValidator
 	implements ConstraintValidator<UniqueGibbonsNumbers, String> {
 
-	@Inject
+	@Autowired
 	private SeriesService seriesService;
 
 	@Override

src/main/java/ru/mystamps/web/validation/jsr303/UniqueLoginValidator.java

@@ -17,15 +17,16 @@
  */
 package ru.mystamps.web.validation.jsr303;
 
-import javax.inject.Inject;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
+import org.springframework.beans.factory.annotation.Autowired;
+
 import ru.mystamps.web.service.UserService;
 
 public class UniqueLoginValidator implements ConstraintValidator<UniqueLogin, String> {
 
-	@Inject
+	@Autowired
 	private UserService userService;
 
 	@Override