Merge pull request #447 from pdudits/converter-bug

Add converter to jpa-listeners-injection, as that breaks older versio…

Author: arjantijms

jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Language.java

@@ -0,0 +1,8 @@
+package org.javaee7.jpa.listeners;
+
+/**
+ * @author Patrik Dudits
+ */
+public enum Language {
+    ENGLISH, GERMAN;
+}

jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/LanguageConverter.java

@@ -0,0 +1,40 @@
+package org.javaee7.jpa.listeners;
+
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+/**
+ * The presence of a converter causes injection to fail in Eclipselink 2.7.4
+ * @author Patrik Dudits
+ */
+@Converter(autoApply = true)
+public class LanguageConverter implements AttributeConverter<Language, String> {
+    @Override
+    public String convertToDatabaseColumn(Language attribute) {
+        if (attribute == null) {
+            return "Unknown";
+        }
+        switch (attribute) {
+            case ENGLISH:
+                return "en";
+            case GERMAN:
+                return "de";
+        }
+        return null;
+    }
+
+    @Override
+    public Language convertToEntityAttribute(String dbData) {
+        if (dbData == null) {
+            return null;
+        }
+        switch (dbData) {
+            case "en":
+                return Language.ENGLISH;
+            case "de":
+                return Language.GERMAN;
+            default:
+                return null;
+        }
+    }
+}

jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Movie.java

@@ -41,6 +41,8 @@ public class Movie implements Serializable {
     @Transient
     private Integer rating;
 
+    private Language language;
+
     public Movie() {
     }
 

jpa/listeners-injection/src/main/resources/META-INF/create.sql

@@ -1,2 +1,2 @@
-CREATE TABLE MOVIE_LISTENER("ID" INTEGER not null primary key, "NAME" VARCHAR(50) not null, "ACTORS" VARCHAR(200) not null)
+CREATE TABLE MOVIE_LISTENER("ID" INTEGER not null primary key, "NAME" VARCHAR(50) not null, "ACTORS" VARCHAR(200) not null, "LANGUAGE" VARCHAR(12))
 CREATE TABLE MOVIE_RATINGS("ID" INTEGER not null primary key, "NAME" VARCHAR(50) not null, "RATING" INTEGER not null)