Runtime: Remove entity tag from type mapper toJavaType-method

speedment · Aug 15, 2016 · 96cc216 · 96cc216
1 parent 50917b1
commit 96cc216
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 20 deletions.
diff --git a/runtime/src/main/java/com/speedment/runtime/config/mapper/TypeMapper.java b/runtime/src/main/java/com/speedment/runtime/config/mapper/TypeMapper.java
@@ -67,14 +67,12 @@ public interface TypeMapper<DB_TYPE, JAVA_TYPE> {
     /**
      * Converts a value from the database domain to the java domain.
      *
-     * @param <ENTITY> the type of the entity
-     *
      * @param column      the column that is being mapped
      * @param entityType  the entity type that the mapping is for
      * @param value       the value to convert
      * @return            the converted value
      */
-    <ENTITY> JAVA_TYPE toJavaType(Column column, Class<ENTITY> entityType, DB_TYPE value);
+    JAVA_TYPE toJavaType(Column column, Class<?> entityType, DB_TYPE value);
 
     /**
      * Converts a value from the java domain to the database domain.

diff --git a/runtime/src/main/java/com/speedment/runtime/config/mapper/bigdecimal/BigDecimalToDouble.java b/runtime/src/main/java/com/speedment/runtime/config/mapper/bigdecimal/BigDecimalToDouble.java
@@ -41,7 +41,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> Double toJavaType(Column column, Class<ENTITY> entityType, BigDecimal value) {
+    public Double toJavaType(Column column, Class<?> entityType, BigDecimal value) {
         return value == null ? null : value.doubleValue();
     }
 

diff --git a/.../main/java/com/speedment/runtime/config/mapper/integer/IntegerZeroOneToBooleanMapper.java b/.../main/java/com/speedment/runtime/config/mapper/integer/IntegerZeroOneToBooleanMapper.java
@@ -40,7 +40,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> Boolean toJavaType(Column column, Class<ENTITY> entityType, Integer value) {
+    public Boolean toJavaType(Column column, Class<?> entityType, Integer value) {
         return value == null ? null : value != 0;
     }
 

diff --git a/...ime/src/main/java/com/speedment/runtime/config/mapper/largeobject/ClobToStringMapper.java b/...ime/src/main/java/com/speedment/runtime/config/mapper/largeobject/ClobToStringMapper.java
@@ -43,7 +43,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> String toJavaType(Column column, Class<ENTITY> entityType, Clob value) {
+    public String toJavaType(Column column, Class<?> entityType, Clob value) {
         if (value == null) {
             return null;
         } else try {

diff --git a/runtime/src/main/java/com/speedment/runtime/config/mapper/primitive/PrimitiveTypeMapper.java b/runtime/src/main/java/com/speedment/runtime/config/mapper/primitive/PrimitiveTypeMapper.java
@@ -53,7 +53,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> T toJavaType(Column column, Class<ENTITY> entityType, T value) {
+    public T toJavaType(Column column, Class<?> entityType, T value) {
         return value;
     }
 

diff --git a/runtime/src/main/java/com/speedment/runtime/config/mapper/string/StringToLocaleMapper.java b/runtime/src/main/java/com/speedment/runtime/config/mapper/string/StringToLocaleMapper.java
@@ -42,7 +42,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> Locale toJavaType(Column column, Class<ENTITY> entityType, String value) {
+    public Locale toJavaType(Column column, Class<?> entityType, String value) {
        return value == null ? null : new Locale(value);
     }
 

diff --git a/.../main/java/com/speedment/runtime/config/mapper/string/TrueFalseStringToBooleanMapper.java b/.../main/java/com/speedment/runtime/config/mapper/string/TrueFalseStringToBooleanMapper.java
@@ -40,7 +40,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> Boolean toJavaType(Column column, Class<ENTITY> entityType, String value) {
+    public Boolean toJavaType(Column column, Class<?> entityType, String value) {
         return value == null ? null : Boolean.valueOf(value);
     }
 

diff --git a/.../src/main/java/com/speedment/runtime/config/mapper/string/YesNoStringToBooleanMapper.java b/.../src/main/java/com/speedment/runtime/config/mapper/string/YesNoStringToBooleanMapper.java
@@ -40,7 +40,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> Boolean toJavaType(Column column, Class<ENTITY> entityType, String value) {
+    public Boolean toJavaType(Column column, Class<?> entityType, String value) {
         return value == null ? null : value.equalsIgnoreCase("yes");
     }
 

diff --git a/runtime/src/main/java/com/speedment/runtime/config/mapper/time/DateToIntMapper.java b/runtime/src/main/java/com/speedment/runtime/config/mapper/time/DateToIntMapper.java
@@ -42,7 +42,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> Integer toJavaType(Column column, Class<ENTITY> entityType, Date value) {
+    public Integer toJavaType(Column column, Class<?> entityType, Date value) {
         return value == null ? null : (int) (value.getTime() / 1000);
     }
 

diff --git a/runtime/src/main/java/com/speedment/runtime/config/mapper/time/DateToLocalDateMapper.java b/runtime/src/main/java/com/speedment/runtime/config/mapper/time/DateToLocalDateMapper.java
@@ -48,7 +48,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> LocalDate toJavaType(Column column, Class<ENTITY> entityType, Date value) {
+    public LocalDate toJavaType(Column column, Class<?> entityType, Date value) {
         return value.toLocalDate();
     }
 

diff --git a/runtime/src/main/java/com/speedment/runtime/config/mapper/time/DateToLongMapper.java b/runtime/src/main/java/com/speedment/runtime/config/mapper/time/DateToLongMapper.java
@@ -43,7 +43,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> Long toJavaType(Column column, Class<ENTITY> entityType, Date value) {
+    public Long toJavaType(Column column, Class<?> entityType, Date value) {
         return value == null ? null : value.getTime();
     }
 

diff --git a/runtime/src/main/java/com/speedment/runtime/config/mapper/time/TimeToIntMapper.java b/runtime/src/main/java/com/speedment/runtime/config/mapper/time/TimeToIntMapper.java
@@ -42,7 +42,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> Integer toJavaType(Column column, Class<ENTITY> entityType, Time value) {
+    public Integer toJavaType(Column column, Class<?> entityType, Time value) {
         return value == null ? null : (int) (value.getTime() / 1000);
     }
 

diff --git a/runtime/src/main/java/com/speedment/runtime/config/mapper/time/TimeToLocalTimeMapper.java b/runtime/src/main/java/com/speedment/runtime/config/mapper/time/TimeToLocalTimeMapper.java
@@ -48,7 +48,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> LocalTime toJavaType(Column column, Class<ENTITY> entityType, Time value) {
+    public LocalTime toJavaType(Column column, Class<?> entityType, Time value) {
         return value.toLocalTime();
     }
 

diff --git a/runtime/src/main/java/com/speedment/runtime/config/mapper/time/TimeToLongMapper.java b/runtime/src/main/java/com/speedment/runtime/config/mapper/time/TimeToLongMapper.java
@@ -42,7 +42,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> Long toJavaType(Column column, Class<ENTITY> entityType, Time value) {
+    public Long toJavaType(Column column, Class<?> entityType, Time value) {
         return value == null ? null : value.getTime();
     }
 

diff --git a/runtime/src/main/java/com/speedment/runtime/config/mapper/time/TimestampToIntMapper.java b/runtime/src/main/java/com/speedment/runtime/config/mapper/time/TimestampToIntMapper.java
@@ -41,7 +41,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> Integer toJavaType(Column column, Class<ENTITY> entityType, Timestamp value) {
+    public Integer toJavaType(Column column, Class<?> entityType, Timestamp value) {
         return value == null ? null : (int) (value.getTime() / 1000);
     }
 

diff --git a/...rc/main/java/com/speedment/runtime/config/mapper/time/TimestampToLocalDateTimeMapper.java b/...rc/main/java/com/speedment/runtime/config/mapper/time/TimestampToLocalDateTimeMapper.java
@@ -48,7 +48,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> LocalDateTime toJavaType(Column column, Class<ENTITY> entityType, Timestamp value) {
+    public LocalDateTime toJavaType(Column column, Class<?> entityType, Timestamp value) {
         return value == null ? null : value.toLocalDateTime();
     }
 

diff --git a/runtime/src/main/java/com/speedment/runtime/config/mapper/time/TimestampToLongMapper.java b/runtime/src/main/java/com/speedment/runtime/config/mapper/time/TimestampToLongMapper.java
@@ -41,7 +41,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> Long toJavaType(Column column, Class<ENTITY> entityType, Timestamp value) {
+    public Long toJavaType(Column column, Class<?> entityType, Timestamp value) {
         return value == null ? null : value.getTime();
     }
 

diff --git a/runtime/src/main/java/com/speedment/runtime/internal/config/mapper/IdentityTypeMapper.java b/runtime/src/main/java/com/speedment/runtime/internal/config/mapper/IdentityTypeMapper.java
@@ -43,7 +43,7 @@ public Type getJavaType(Column column) {
     }
 
     @Override
-    public <ENTITY> T toJavaType(Column column, Class<ENTITY> entityType, T value) {
+    public T toJavaType(Column column, Class<?> entityType, T value) {
         return value;
     }