[Sandbox-commits] r461 - in jpa2-validation/trunk: . jsr303-validation jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/test jsr317-jpa2 jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/sample jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/test

14 Jan 2011

Author: fdesbois
Date: 2011-01-14 12:20:23 +0100 (Fri, 14 Jan 2011)
New Revision: 461

Url: http://nuiton.org/repositories/revision/sandbox/461

Log:
Use JSR-330 : @Inject instead of @Autowired

Modified:
   jpa2-validation/trunk/jsr303-validation/pom.xml
   jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/BaseService.java
   jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImpl.java
   jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/CustomerValidationTest.java
   jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/test/BaseValidationTest.java
   jpa2-validation/trunk/jsr317-jpa2/pom.xml
   jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/CustomerDAOImpl.java
   jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/ModelContextImpl.java
   jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/sample/DataSampleProvider.java
   jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/test/BaseJpaTest.java
   jpa2-validation/trunk/pom.xml

Modified: jpa2-validation/trunk/jsr303-validation/pom.xml
===================================================================

--- jpa2-validation/trunk/jsr303-validation/pom.xml	2011-01-12 13:52:52 UTC (rev 460)
+++ jpa2-validation/trunk/jsr303-validation/pom.xml	2011-01-14 11:20:23 UTC (rev 461)
@@ -62,6 +62,13 @@
             <artifactId>validation-api</artifactId>
         </dependency>
 
+        <!-- Injection : JSR-330 -->
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
+        </dependency>
+
         <!--  LOGGING -->
         <dependency>
             <groupId>commons-logging</groupId>

Modified: jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/BaseService.java
===================================================================
--- jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/BaseService.java	2011-01-12 13:52:52 UTC (rev 460)
+++ jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/BaseService.java	2011-01-14 11:20:23 UTC (rev 461)
@@ -1,5 +1,6 @@
 package org.nuiton.sandbox.jsr303.validation.services;
 
+import javax.inject.Inject;
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import javax.validation.Validator;
@@ -9,7 +10,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.sandbox.jsr317.jpa2.persistence.ModelContext;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Created on 28 oct. 2010
@@ -21,10 +21,10 @@
 
     protected final Log logger = LogFactory.getLog(getClass());
 
-    @Autowired
+    @Inject
     protected ModelContext modelContext;
 
-    @Autowired
+    @Inject
     protected Validator validator;
 
     protected <T> void checkConstraints(T object, Class<?>... groups) throws ConstraintViolationException {

Modified: jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImpl.java
===================================================================
--- jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImpl.java	2011-01-12 13:52:52 UTC (rev 460)
+++ jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImpl.java	2011-01-14 11:20:23 UTC (rev 461)
@@ -1,11 +1,11 @@
 package org.nuiton.sandbox.jsr303.validation.services;
 
+import javax.inject.Inject;
+import javax.inject.Named;
 import javax.validation.ConstraintViolationException;
 
 import org.nuiton.sandbox.jsr317.jpa2.entity.Customer;
 import org.nuiton.sandbox.jsr317.jpa2.persistence.CustomerDAO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -14,11 +14,11 @@
  * @author fdesbois <florian.desbois@wiztivi.com>
  * @version $Id$
  */
-@Service
+@Named
 @Transactional(readOnly = true)
 public class ServiceCustomerImpl extends BaseService implements ServiceCustomer {
 
-    @Autowired
+    @Inject
     protected CustomerDAO customerDAO;
 
     @Override

Modified: jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/CustomerValidationTest.java
===================================================================
--- jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/CustomerValidationTest.java	2011-01-12 13:52:52 UTC (rev 460)
+++ jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/CustomerValidationTest.java	2011-01-14 11:20:23 UTC (rev 461)
@@ -1,5 +1,6 @@
 package org.nuiton.sandbox.jsr303.validation;
 
+import javax.inject.Inject;
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import java.util.Set;
@@ -12,7 +13,6 @@
 import org.nuiton.sandbox.jsr303.validation.test.BaseValidationTest;
 import org.nuiton.sandbox.jsr317.jpa2.entity.Customer;
 import org.nuiton.sandbox.jsr317.jpa2.persistence.CustomerDAO;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -25,7 +25,7 @@
 
     private static final Log log = LogFactory.getLog(CustomerValidationTest.class);
 
-    @Autowired
+    @Inject
     protected CustomerDAO userDAO;
 
     @Test

Modified: jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/test/BaseValidationTest.java
===================================================================
--- jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/test/BaseValidationTest.java	2011-01-12 13:52:52 UTC (rev 460)
+++ jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/test/BaseValidationTest.java	2011-01-14 11:20:23 UTC (rev 461)
@@ -1,5 +1,11 @@
 package org.nuiton.sandbox.jsr303.validation.test;
 
+import javax.inject.Inject;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.validation.Validator;
+import java.lang.annotation.Annotation;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Assert;
@@ -8,14 +14,8 @@
 import org.nuiton.sandbox.jsr317.jpa2.persistence.ModelContext;
 import org.nuiton.sandbox.jsr317.jpa2.sample.DataProviderLimit;
 import org.nuiton.sandbox.jsr317.jpa2.test.BaseJpaTest;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validator;
-import java.lang.annotation.Annotation;
-
 /**
  * Created on 26 oct. 2010
  *
@@ -27,10 +27,10 @@
 
     private static final Log log = LogFactory.getLog(BaseValidationTest.class);
 
-    @Autowired
+    @Inject
     protected ModelContext modelContext;
 
-    @Autowired
+    @Inject
     protected Validator validator;
 
     protected class ValidationTestRule extends JpaTestRule {

Modified: jpa2-validation/trunk/jsr317-jpa2/pom.xml
===================================================================
--- jpa2-validation/trunk/jsr317-jpa2/pom.xml	2011-01-12 13:52:52 UTC (rev 460)
+++ jpa2-validation/trunk/jsr317-jpa2/pom.xml	2011-01-14 11:20:23 UTC (rev 461)
@@ -76,6 +76,13 @@
       <artifactId>hibernate-core</artifactId>
     </dependency>
 
+    <!-- Injection : JSR-330 -->
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
+
     <!--  LOGGING -->
     <dependency>
       <groupId>commons-logging</groupId>

Modified: jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/CustomerDAOImpl.java
===================================================================
--- jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/CustomerDAOImpl.java	2011-01-12 13:52:52 UTC (rev 460)
+++ jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/CustomerDAOImpl.java	2011-01-14 11:20:23 UTC (rev 461)
@@ -1,12 +1,13 @@
 package org.nuiton.sandbox.jsr317.jpa2.persistence;
 
+import javax.inject.Named;
+
 import org.nuiton.sandbox.jsr317.jpa2.entity.AccessCode;
 import org.nuiton.sandbox.jsr317.jpa2.entity.AccessCodeImpl;
 import org.nuiton.sandbox.jsr317.jpa2.entity.Address;
 import org.nuiton.sandbox.jsr317.jpa2.entity.AddressImpl;
 import org.nuiton.sandbox.jsr317.jpa2.entity.Customer;
 import org.nuiton.sandbox.jsr317.jpa2.entity.CustomerImpl;
-import org.springframework.stereotype.Repository;
 
 /**
  * Created on 22 oct. 2010
@@ -14,7 +15,7 @@
  * @author fdesbois <fdesbois@codelutin.com>
  * @version $Id$
  */
-@Repository
+@Named
 public class CustomerDAOImpl extends BaseDAOImpl<Customer, CustomerImpl> implements CustomerDAO {
 
     public CustomerDAOImpl() {

Modified: jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/ModelContextImpl.java
===================================================================
--- jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/ModelContextImpl.java	2011-01-12 13:52:52 UTC (rev 460)
+++ jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/ModelContextImpl.java	2011-01-14 11:20:23 UTC (rev 461)
@@ -1,5 +1,7 @@
 package org.nuiton.sandbox.jsr317.jpa2.persistence;
 
+import javax.inject.Inject;
+import javax.inject.Named;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import java.util.HashMap;
@@ -7,9 +9,7 @@
 
 import org.nuiton.sandbox.jsr317.jpa2.entity.BaseEntity;
 import org.nuiton.sandbox.jsr317.jpa2.persistence.BaseDAOImpl.SaveStrategy;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
-import org.springframework.stereotype.Service;
 
 /**
  * Created on 19 nov. 2010
@@ -17,10 +17,10 @@
  * @author fdesbois <florian.desbois@wiztivi.com>
  * @version $Id$
  */
-@Service
+@Named
 public class ModelContextImpl implements ModelContext {
 
-    @Autowired
+    @Inject
     protected ApplicationContext context;
 
     @PersistenceContext

Modified: jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/sample/DataSampleProvider.java
===================================================================
--- jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/sample/DataSampleProvider.java	2011-01-12 13:52:52 UTC (rev 460)
+++ jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/sample/DataSampleProvider.java	2011-01-14 11:20:23 UTC (rev 461)
@@ -1,5 +1,7 @@
 package org.nuiton.sandbox.jsr317.jpa2.sample;
 
+import javax.inject.Inject;
+import javax.inject.Named;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
@@ -8,24 +10,23 @@
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.sandbox.jsr317.jpa2.entity.Customer;
 import org.nuiton.sandbox.jsr317.jpa2.persistence.CustomerDAO;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
  * Provider of data sample usefull for tests or having usable data in the database. Defined as a {@link Service} to be injected using Spring
- * {@link Autowired} annotation.
+ * {@link Inject} annotation.
  * <p />
  * Created on 3 nov. 2010
  *
  * @author fdesbois <fdesbois@codelutin.com>
  * @version $Id$
  */
-@Service
+@Named
 public class DataSampleProvider {
 
     private static final Log logger = LogFactory.getLog(DataSampleProvider.class);
 
-    @Autowired
+    @Inject
     protected CustomerDAO customerDAO;
 
     protected List<Customer> customers = new ArrayList<Customer>();

Modified: jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/test/BaseJpaTest.java
===================================================================
--- jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/test/BaseJpaTest.java	2011-01-12 13:52:52 UTC (rev 460)
+++ jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/test/BaseJpaTest.java	2011-01-14 11:20:23 UTC (rev 461)
@@ -1,5 +1,9 @@
 package org.nuiton.sandbox.jsr317.jpa2.test;
 
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Rule;
@@ -10,14 +14,10 @@
 import org.nuiton.sandbox.jsr317.jpa2.sample.DataProviderLimit;
 import org.nuiton.sandbox.jsr317.jpa2.sample.DataSampleProvider;
 import org.nuiton.sandbox.jsr317.jpa2.sample.UseDataProvider;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
 /**
  * Created on 18 oct. 2010
  *
@@ -30,16 +30,16 @@
 
     private static final Log log = LogFactory.getLog(BaseJpaTest.class);
 
-    @Autowired
+    @Inject
     protected ApplicationContext context;
 
     @PersistenceContext
     protected EntityManager entityManager;
 
-    @Autowired
+    @Inject
     protected DataSampleProvider dataProvider;
 
-    @Autowired
+    @Inject
     protected CustomerDAO userDAO;
 
     protected class JpaTestRule extends TestWatchman {

Modified: jpa2-validation/trunk/pom.xml
===================================================================
--- jpa2-validation/trunk/pom.xml	2011-01-12 13:52:52 UTC (rev 460)
+++ jpa2-validation/trunk/pom.xml	2011-01-14 11:20:23 UTC (rev 461)
@@ -77,7 +77,7 @@
         <version>${springVersion}</version>
       </dependency>
 
-      <!-- JPA : JSR-317- -->
+      <!-- Persistence : JSR-317- -->
       <dependency>
         <groupId>org.hibernate.javax.persistence</groupId>
         <artifactId>hibernate-jpa-2.0-api</artifactId>
@@ -91,20 +91,20 @@
         <scope>provided</scope>
       </dependency>
 
+      <!-- Validation : JSR-303 -->
       <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-core</artifactId>
-        <version>${hibernateVersion}</version>
-        <scope>test</scope>
-      </dependency>
-
-      <!-- Bean Validation : JSR-303 -->
-      <dependency>
         <groupId>javax.validation</groupId>
         <artifactId>validation-api</artifactId>
         <version>${validationApiVersion}</version>
       </dependency>
 
+      <!-- Injection : JSR-330 -->
+      <dependency>
+        <groupId>javax.inject</groupId>
+        <artifactId>javax.inject</artifactId>
+        <version>1</version>
+      </dependency>
+
       <!--  LOGGING -->
       <dependency>
         <groupId>log4j</groupId>
@@ -131,6 +131,13 @@
 
       <dependency>
         <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-core</artifactId>
+        <version>${hibernateVersion}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator</artifactId>
         <version>${hibernateValidatorVersion}</version>
         <scope>test</scope>

    

fdesbois＠users.nuiton.org