Merge branch 'master' of git@github.com:javaee-samples/javaee8-samples.git

Author: arjantijms

.travis.yml

@@ -9,6 +9,7 @@ env:
   - TESTFOLDER=jpa
   - TESTFOLDER=jsf
   - TESTFOLDER=jsonb
+  - TESTFOLDER=validation
 
 install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
 

jpa/stream/src/main/java/org/javaee8/jpa/stream/repository/PersonRepository.java

@@ -13,13 +13,13 @@
  */
 public class PersonRepository {
 
-    @PersistenceContext(unitName = "DEFAULT_PU")
-    private EntityManager em;
+    @PersistenceContext
+    private EntityManager entityManager;
 
     public Stream<Person> findAll() {
-        CriteriaQuery cq = em.getCriteriaBuilder().createQuery();
-        cq.select(cq.from(Person.class));
-        return em.createQuery(cq).getResultStream();
+        CriteriaQuery criteriaQuery = entityManager.getCriteriaBuilder().createQuery();
+        criteriaQuery.select(criteriaQuery.from(Person.class));
+        return entityManager.createQuery(criteriaQuery).getResultStream();
     }
 
 }

jpa/stream/src/test/resources/test-persistence.xml

@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-  <persistence-unit name="DEFAULT_PU" transaction-type="JTA">
-    <jta-data-source>java:comp/DefaultDataSource</jta-data-source>
-    <exclude-unlisted-classes>false</exclude-unlisted-classes>
+  
+    <!-- 
+        This defines the persistence unit from which the entity manager is used in org.javaee8.jpa.stream.repository.PersonRepository
+        
+        Note that this relies on the defaults; in Java EE the transaction type defaults to JTA and the data source defaults to the platform default data source
+    
+    -->
+    
+    <persistence-unit name="TEST_PU">
     <properties>
       <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
       <property name="javax.persistence.sql-load-script-source" value="META-INF/sql/insert.sql"/>

pom.xml

@@ -92,13 +92,13 @@
      -->
     <modules>
       <module>test-utils</module>
-      
       <module>servlet</module>
       <module>security</module>
       <module>jsf</module>
       <module>cdi</module>
       <module>jpa</module>
       <module>jsonb</module>
+      <module>validation</module>  
     </modules>
 
     <dependencyManagement>

validation/README.md

@@ -0,0 +1,8 @@
+# Java EE 8 Samples: Bean Validation 2#
+
+The [JSR 380](https://www.jcp.org/en/jsr/detail?id=380) specifies the next version of Bean Validation, version 2. 
+
+## Samples ##
+
+ - constraints:
+        Testing new features coming with Bean Validation 2 like java.time API validation support, repeatable annotations and type annotations applied on Lists and Maps. 

validation/constraints/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.javaee8</groupId>
+        <artifactId>validation</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>constraints</artifactId>
+    <name>Java EE 8 Samples: Bean Validation 2: Support for java.time API</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.0.Final</version>
+        </dependency>
+    </dependencies>
+</project>

validation/constraints/src/main/java/org/javaee8/validation/Address.java

@@ -0,0 +1,20 @@
+package org.javaee8.validation;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * @author mertcaliskan
+ */
+public class Address {
+
+    @NotEmpty
+    private String detail;
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+}

validation/constraints/src/main/java/org/javaee8/validation/Admin.java

@@ -0,0 +1,7 @@
+package org.javaee8.validation;
+
+/**
+ * @author mertcaliskan
+ */
+public interface Admin {
+}

validation/constraints/src/main/java/org/javaee8/validation/Country.java

@@ -0,0 +1,22 @@
+package org.javaee8.validation;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @author mertcaliskan
+ */
+public class Country {
+
+    @NotNull
+    @Size(min = 2, max = 2)
+    private String countryCode;
+
+    public String getCountryCode() {
+        return countryCode;
+    }
+
+    public void setCountryCode(String countryCode) {
+        this.countryCode = countryCode;
+    }
+}

validation/constraints/src/main/java/org/javaee8/validation/Person.java

@@ -0,0 +1,74 @@
+package org.javaee8.validation;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Past;
+import javax.validation.constraints.Size;
+import javax.validation.groups.Default;
+import java.time.LocalDate;
+import java.time.Year;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * @author mertcaliskan
+ */
+class Person {
+
+    @Past
+    private Year yearOfBirth;
+
+    private Optional<@Past LocalDate> marriageAnniversary;
+
+    private List<@NotNull @Email String> emails;
+
+    @Size(min = 8, groups = Default.class)
+    @Size(min = 12, groups = Admin.class)
+    private String password;
+
+    private Map<@Valid Country, @Valid Address> addressMap = new HashMap<>();
+
+
+    public Year getYearOfBirth() {
+        return yearOfBirth;
+    }
+
+    public void setYearOfBirth(Year yearOfBirth) {
+        this.yearOfBirth = yearOfBirth;
+    }
+
+    public Optional<LocalDate> getMarriageAnniversary() {
+        return marriageAnniversary;
+    }
+
+    public void setMarriageAnniversary(Optional<LocalDate> marriageAnniversary) {
+        this.marriageAnniversary = marriageAnniversary;
+    }
+
+    public List<String> getEmails() {
+        return emails;
+    }
+
+    public void setEmails(List<String> emails) {
+        this.emails = emails;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public Map<Country, Address> getAddressMap() {
+        return addressMap;
+    }
+
+    public void setAddressMap(Map<Country, Address> addressMap) {
+        this.addressMap = addressMap;
+    }
+}