#669 - Remove @EnumMapping ... migrate to use @DbEnumValue or @EnumValue

src/main/java/com/avaje/ebean/annotation/EnumMapping.java

@@ -1,90 +0,0 @@
-package com.avaje.ebean.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * For mapping the values of an Enum to and from Database values.
- * <p>
- * Also refer to the {@link EnumValue} approach which probably the preferred now
- * (preferred over using this EnumMapping annotation).
- * </p>
- * <p>
- * Both of the approaches defined in the JPA have significant problems!!!
- * </p>
- * <p>
- * Using the ordinal value is VERY RISKY because that depends on the compile
- * order of the enum values. Aka if you change the order of the enum values you
- * have changed their ordinal values and now your DB values are WRONG - a HUGE
- * disaster!!!.
- * </p>
- * <p>
- * Using the String values of enums is fairly restrictive because in a Database
- * these values are usually truncated into short codes (e.g. "A" short for
- * "ACTIVE") so space used in the database is minimised. Making your enum names
- * match the database values would give them very short less meaningful names -
- * not a great solution.
- * </p>
- * <p>
- * You can use this annotation to control the mapping of your enums to database
- * values.
- * </p>
- * <p>
- * The design of this using nameValuePairs is not optimal for safety or
- * refactoring so if you have a better solution I'm all ears. The other
- * solutions would probably involve modifying each enumeration with a method
- * which may be ok.
- * </p>
- * <p>
- * An example mapping the UserState enum.
- * </p>
- * 
- * <pre class="code">
- * ...
- * &#064;EnumMapping(nameValuePairs=&quot;NEW=N, ACTIVE=A, INACTIVE=I&quot;)
- *  public enum UserState {
- *  NEW,
- *  ACTIVE,
- *  INACTIVE;
- *  }
- * </pre>
- * 
- * @see EnumValue
- */
-@Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EnumMapping {
-
-  /**
-   * A comma delimited list of name=value pairs.
-   * <p>
-   * e.g. "ACTIVE=A, INACTIVE=I, NEW=N".
-   * </p>
-   * <p>
-   * Where ACTIVE, INACTIVE and NEW are the enumeration values and "A", "I" and
-   * "N" are the database values.
-   * </p>
-   * <p>
-   * This is not really an optimal approach so if you have a better one I'm all
-   * ears - thanks.
-   * </p>
-   */
-  String nameValuePairs();
-
-  /**
-   * Defaults to mapping values to database VARCHAR type. If this is set to true
-   * then the values will be converted to INTEGER and mapped to the database
-   * integer type.
-   * <p>
-   * e.g. "ACTIVE=1, INACTIVE=0, NEW=2".
-   * </p>
-   */
-  boolean integerType() default false;
-
-  /**
-   * The length of DB column if mapping to string values.
-   */
-  int length() default 0;
-}

src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java

@@ -2,17 +2,27 @@ package com.avaje.ebeaninternal.server.type;
 
 import com.avaje.ebean.annotation.DbEnumType;
 import com.avaje.ebean.annotation.DbEnumValue;
-import com.avaje.ebean.annotation.EnumMapping;
 import com.avaje.ebean.annotation.EnumValue;
-import com.avaje.ebean.config.*;
+import com.avaje.ebean.config.CompoundType;
+import com.avaje.ebean.config.CompoundTypeProperty;
+import com.avaje.ebean.config.JsonConfig;
+import com.avaje.ebean.config.ScalarTypeConverter;
+import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebean.config.dbplatform.DatabasePlatform;
 import com.avaje.ebean.config.dbplatform.DbType;
 import com.avaje.ebeaninternal.server.core.BootupClasses;
-import com.avaje.ebeaninternal.server.lib.util.StringHelper;
-import com.avaje.ebeaninternal.server.type.reflect.*;
+import com.avaje.ebeaninternal.server.type.reflect.CheckImmutable;
+import com.avaje.ebeaninternal.server.type.reflect.CheckImmutableResponse;
+import com.avaje.ebeaninternal.server.type.reflect.ImmutableMeta;
+import com.avaje.ebeaninternal.server.type.reflect.ImmutableMetaFactory;
+import com.avaje.ebeaninternal.server.type.reflect.KnownImmutable;
+import com.avaje.ebeaninternal.server.type.reflect.ReflectionBasedCompoundType;
+import com.avaje.ebeaninternal.server.type.reflect.ReflectionBasedCompoundTypeProperty;
+import com.avaje.ebeaninternal.server.type.reflect.ReflectionBasedTypeBuilder;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.joda.time.*;
+import org.joda.time.DateMidnight;
+import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 import org.joda.time.LocalDateTime;
 import org.joda.time.LocalTime;
@@ -32,11 +42,29 @@ import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.sql.Types;
-import java.time.*;
+import java.time.DayOfWeek;
 import java.time.Duration;
 import java.time.Instant;
+import java.time.Month;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
 import java.time.Period;
-import java.util.*;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Currency;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -516,20 +544,9 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable {
       }
     }
 
-    // get the mapping information from EnumMapping
-    EnumMapping enumMapping = enumType.getAnnotation(EnumMapping.class);
-    if (enumMapping == null) {
-      // look for EnumValue annotations instead
-      return createEnumScalarType2(enumType);
-    }
 
-    String nameValuePairs = enumMapping.nameValuePairs();
-    boolean integerType = enumMapping.integerType();
-    int dbColumnLength = enumMapping.length();
-
-    Map<String, String> nameValueMap = StringHelper.delimitedToMap(nameValuePairs, ",", "=");
-
-    return createEnumScalarType(enumType, nameValueMap, integerType, dbColumnLength);
+    // look for EnumValue annotations instead
+    return createEnumScalarType2(enumType);
   }
 
   /**